[FFmpeg-cvslog] h264: don't initialize missing pictures when using VDPAU.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Feb 17 22:33:40 2013 +0100| [259603b9176701410d6edeedbcbde565c767f27b] | committer: Carl Eugen Hoyos

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

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

Reported by irc user ioni.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=259603b9176701410d6edeedbcbde565c767f27b
---

 libavcodec/h264.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c14b95a..0644dad 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;