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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jun 10 20:40:08 2013 +0300| [a98afbe352d7b3af9737f88ffde8ce5081133c49] | committer: Rémi Denis-Courmont

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

This reverts commit c16bc980cbf1e3b8d3cac2f35f584d8b5b83fa5b.
This is no longer applicable with current libav HEAD.

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

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

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 36b491c..e0d3de6 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -99,6 +99,7 @@ endif
 # Linux
 ifdef HAVE_LINUX
 FFMPEGCONF += --target-os=linux --enable-pic
+
 endif
 
 # Windows
@@ -120,12 +121,6 @@ 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"),)