]> git.sesse.net Git - vlc/commitdiff
Revert "contrib: ffmpeg: disable non-h264 hwaccels (fixes #8537)"
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 10 Jun 2013 17:40:08 +0000 (20:40 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 10 Jun 2013 17:40:08 +0000 (20:40 +0300)
This reverts commit c16bc980cbf1e3b8d3cac2f35f584d8b5b83fa5b.
This is no longer applicable with current libav HEAD.

contrib/src/ffmpeg/rules.mak

index 36b491c6d46ea601d86309f9d5360dff95033a01..e0d3de6d86a627f4fac1134346a2eaab23a102ae 100644 (file)
@@ -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"),)