aboutsummaryrefslogtreecommitdiffhomepage
path: root/libvo
diff options
context:
space:
mode:
authorGravatar cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-21 20:11:05 +0000
committerGravatar cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-21 20:11:05 +0000
commita331f3fd15b68f29103ef007830e110a69468f97 (patch)
tree080d4730e97f590d21c6d2550b26bf093893febf /libvo
parent9f47d4d37c975659440ae91c175d8d4bbf7fbe54 (diff)
Test if create_vdp_decoder() might succeed by calling it from config()
with a small value for max_reference_frames. This does not make automatic recovery by using software decoder possible, but lets MPlayer fail more graciously on - actually existing - buggy hardware that does not support certain H264 widths when using hardware accelerated decoding (784, 864, 944, 1024, 1808, 1888 pixels on NVIDIA G98) and if the user tries to hardware-decode more samples at the same time than supported. Might break playback of H264 Intra-Only samples on hardware with very little video memory. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29027 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_vdpau.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index a97c00f7d2..6a5936c959 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -596,6 +596,9 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
vid_surface_num = -1;
resize();
+ if (!create_vdp_decoder(2))
+ return -1;
+
return 0;
}