[vlc-commits] contrib: ffmpeg: disable non-h264 hwaccels (fixes #8537)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 30 17:35:18 2013 +0300| [c16bc980cbf1e3b8d3cac2f35f584d8b5b83fa5b] | committer: Rémi Denis-Courmont

contrib: ffmpeg: disable non-h264 hwaccels (fixes #8537)

Better fall back to software decoding than crash.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c16bc980cbf1e3b8d3cac2f35f584d8b5b83fa5b
---

 contrib/src/ffmpeg/rules.mak |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index be7e342..6951933 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -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"),)