From 58d196c07e4faae0e9e7c03c64029c5c36e03c9a Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 11 Dec 2012 18:16:42 +0100 Subject: video: different way to enable hardware decoding, add software fallback Deprecate the hardware specific video codec entries (like ffh264vdpau). Replace them with the --hwdec switch, which requests that a specific hardware decoding API should be used. The codecs.conf entries will be removed at a later time, but for now they are useful for testing and compatibility. Instead of --vc=ffh264vdpau, --hwdec=vdpau should be used. Add a fallback if hardware decoding fails. Most hardware decoders (including vdpau) support only a subset of h264, and having such a fallback is supposed to enable a better user experience. --- etc/example.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc/example.conf') diff --git a/etc/example.conf b/etc/example.conf index 6fe1b6bdf1..bb37a5e26d 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -87,8 +87,8 @@ # but only take effect when the profile is active. #[vo.vdpau] -# Use hardware decoding (this will break playback of some h264 files) -#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau, +# Use hardware decoding (this might break playback of some h264 files) +#hwdec=vdpau # Most video filters do not work with vdpau. #vf-clr=yes -- cgit v1.2.3