]> git.sesse.net Git - vlc/commitdiff
contrib: ffmpeg: disable non-h264 hwaccels (fixes #8537)
authorRémi Denis-Courmont <remi@remlab.net>
Tue, 30 Apr 2013 14:35:18 +0000 (17:35 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Tue, 30 Apr 2013 14:35:18 +0000 (17:35 +0300)
Better fall back to software decoding than crash.

contrib/src/ffmpeg/rules.mak

index be7e34205c35f533ab093890b44ff324f3c20d7d..69519336b45a6ec7cc19f1cfd9d9596c602ad960 100644 (file)
@@ -96,7 +96,6 @@ endif
 # Linux
 ifdef HAVE_LINUX
 FFMPEGCONF += --target-os=linux --enable-pic
-
 endif
 
 # Windows
@@ -118,6 +117,12 @@ else # !Windows
 FFMPEGCONF += --enable-pthreads
 endif
 
+# Disable mpegvideo-based hwaccel - known broken
+FFMPEGCONF += \
+       $(foreach codec,h263 mpeg1 mpeg2 mpeg4 vc1 wmv3,\
+               $(foreach api,dxva2 vaapi vdpau,\
+                       --disable-hwaccel=$(codec)_$(api)))
+
 # Build
 PKGS += ffmpeg
 ifeq ($(call need_pkg,"libavcodec >= 54.25.0 libavformat >= 53.21.0 libswscale"),)