[vlc-commits] contrib: Only use options common to Libav and FFmpeg
Rafaël Carré
git at videolan.org
Fri Dec 30 00:10:15 CET 2011
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu Dec 29 18:09:58 2011 -0500| [0accbd7955c0b4448137482362801cbed6ada750] | committer: Rafaël Carré
contrib: Only use options common to Libav and FFmpeg
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0accbd7955c0b4448137482362801cbed6ada750
---
contrib/src/ffmpeg/rules.mak | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 73ff91a..0da0699 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -12,15 +12,17 @@ FFMPEGCONF = \
--disable-debug \
--enable-gpl \
--enable-postproc \
- --disable-ffprobe \
- --disable-ffserver \
--disable-ffmpeg \
- --disable-ffplay \
--disable-avconv \
--disable-devices \
--disable-protocols \
--disable-avfilter \
--disable-network
+
+# Those tools are named differently in FFmpeg and Libav
+# --disable-ffserver \
+# --disable-ffplay \
+# --disable-ffprobe
DEPS_ffmpeg = zlib gsm openjpeg
# Optional dependencies
More information about the vlc-commits
mailing list