[FFmpeg-devel] [PATCH]Fix crash when using h264 vdpau decoder

[Carl Eugen Hoyos]

Hi!

Attached patch fixes a crash (assertion failure) when running mplayer -vc 
ffh264vdpau, a regression since 1c5b8b9.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 89fc222..d53c2c5 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;