diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-17 22:33:40 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-02-17 22:33:40 +0100 |
| commit | 259603b9176701410d6edeedbcbde565c767f27b (patch) | |
| tree | 7870f72ee927617443fe1435bdd6f8cc2d078b24 /libavcodec/h264.c | |
| parent | dece584a639c9fd61a72e21800815e8397b3b617 (diff) | |
| download | ffmpeg-259603b9176701410d6edeedbcbde565c767f27b.tar.gz | |
h264: don't initialize missing pictures when using VDPAU.
This fixes an assertion failure when running mplayer -vc ffh264vdpau.
Reported by irc user ioni.
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c14b95a064..0644dadbb1 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1704,7 +1704,8 @@ int ff_h264_frame_start(H264Context *h) if ((ret = alloc_picture(h, pic)) < 0) 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); h->cur_pic_ptr = pic; |