virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

h264: don't initialize missing pictures when using VDPAU.

Browse Source 
This fixes an assertion failure when running mplayer -vc ffh264vdpau.

Reported by irc user ioni.
This commit is contained in:
Carl Eugen Hoyos
2013-02-17 22:33:40 +01:00
parent dece584a63
commit 259603b917
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264.c
View File

@@ -1704,7 +1704,8 @@ int ff_h264_frame_start(H264Context *h)
if ((ret = alloc_picture(h, pic)) < 0) if ((ret = alloc_picture(h, pic)) < 0)
return ret; return ret;
if(!h->sync && !h->avctx->hwaccel) if(!h->sync && !h->avctx->hwaccel &&
!(h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU))
avpriv_color_frame(&pic->f, c); avpriv_color_frame(&pic->f, c);
h->cur_pic_ptr = pic; h->cur_pic_ptr = pic;