vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Wed Sep 7 17:56:55 2016 +0200| [0716db4d953ea19672f2b19d2dd839cb50a4c7e3] | committer: Hugo Beauzée-Luyssen
contribs: Fix libav build > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0716db4d953ea19672f2b19d2dd839cb50a4c7e3 --- contrib/src/ffmpeg/rules.mak | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index c8125f4..e4178c6 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -166,9 +166,13 @@ ifndef HAVE_MINGW_W64 DEPS_ffmpeg += directx endif endif -FFMPEGCONF += --target-os=mingw32 --enable-memalign-hack +FFMPEGCONF += --target-os=mingw32 FFMPEGCONF += --enable-w32threads --enable-dxva2 +ifdef USE_FFMPEG +FFMPEGCONF += --enable-memalign-hack +endif + ifdef HAVE_WIN64 FFMPEGCONF += --cpu=athlon64 --arch=x86_64 else _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
