[vlc-commits] ffmpeg/libav: allow the use of 'thumb' if we don't specify 'small'
Felix Paul Kühne
git at videolan.org
Wed Sep 11 18:25:24 CEST 2013
vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Sep 11 18:09:01 2013 +0200| [52060a049f99e016ed1ef322eb2ee8a5a1f071b3] | committer: Felix Paul Kühne
ffmpeg/libav: allow the use of 'thumb' if we don't specify 'small'
(cherry picked from commit 3bfa3ffc2a8e2647c1fea2240d85774427840616)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=52060a049f99e016ed1ef322eb2ee8a5a1f071b3
---
contrib/src/ffmpeg/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index debee52..30f5dbb 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -38,12 +38,12 @@ endif
# Small size
ifdef ENABLE_SMALL
FFMPEGCONF += --enable-small
+endif
ifeq ($(ARCH),arm)
ifdef HAVE_ARMV7A
FFMPEGCONF += --enable-thumb
endif
endif
-endif
ifdef HAVE_CROSS_COMPILE
FFMPEGCONF += --enable-cross-compile
More information about the vlc-commits
mailing list