Skip to content

V
vlc-2-2
Commit c16bc980 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

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

Better fall back to software decoding than crash.
parent c7991ee6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
contrib/src/ffmpeg/rules.mak
View file @ c16bc980
...@@ -96,7 +96,6 @@ endif ...@@ -96,7 +96,6 @@ endif
# Linux # Linux
ifdef HAVE_LINUX ifdef HAVE_LINUX
FFMPEGCONF += --target-os=linux --enable-pic FFMPEGCONF += --target-os=linux --enable-pic
endif endif
# Windows # Windows
...@@ -118,6 +117,12 @@ else # !Windows ...@@ -118,6 +117,12 @@ else # !Windows
FFMPEGCONF += --enable-pthreads FFMPEGCONF += --enable-pthreads
endif 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 # Build
PKGS += ffmpeg PKGS += ffmpeg
ifeq ($(call need_pkg,"libavcodec >= 54.25.0 libavformat >= 53.21.0 libswscale"),) ifeq ($(call need_pkg,"libavcodec >= 54.25.0 libavformat >= 53.21.0 libswscale"),)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment