vlc/vlc-1.2 | branch: master | Rafaël Carré <[email protected]> | Thu Dec 29 18:09:58 2011 -0500| [6d2cf9f35b16f9910e287ab953178aaf5f7274d6] | committer: Jean-Baptiste Kempf
contrib: Only use options common to Libav and FFmpeg (cherry picked from commit 0accbd7955c0b4448137482362801cbed6ada750) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=6d2cf9f35b16f9910e287ab953178aaf5f7274d6 --- 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 a4ca133..b9519cf 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 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
