vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Jan 28 17:01:49 2015 +0100| [0b1889658a895869f9bbc40c53e6f406f5e2d5f4] | committer: Jean-Baptiste Kempf
Contribs: disable FFmpeg/libav programs only when cross-compiling It can be useful to test avplay/ffplay localy (cherry picked from commit 8a72b02af5c867d32ede00f53e9e67c50818c282) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0b1889658a895869f9bbc40c53e6f406f5e2d5f4 --- contrib/src/ffmpeg/rules.mak | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index e55187c..8401113 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -26,7 +26,6 @@ FFMPEGCONF = \ --disable-filters \ --disable-bsfs \ --disable-bzlib \ - --disable-programs \ --disable-avresample ifdef USE_FFMPEG @@ -59,7 +58,7 @@ endif endif ifdef HAVE_CROSS_COMPILE -FFMPEGCONF += --enable-cross-compile +FFMPEGCONF += --enable-cross-compile --disable-programs ifndef HAVE_DARWIN_OS FFMPEGCONF += --cross-prefix=$(HOST)- endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
