[FFmpeg-cvslog] h264: don't initialize missing pictures when using a hwaccel

Hendrik Leppkes git at videolan.org
Sun Feb 17 00:35:44 CET 2013


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Feb 17 00:25:34 2013 +0100| [1d6f6ff4d9faf309b1ea38dc11b38c90b72b03fd] | committer: Michael Niedermayer

h264: don't initialize missing pictures when using a hwaccel

Writing into uninitialized hw surfaces is not supported and triggers an assert inside avpriv_color_frame

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8418310..89fc222 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1704,7 +1704,7 @@ int ff_h264_frame_start(H264Context *h)
 
     if ((ret = alloc_picture(h, pic)) < 0)
         return ret;
-    if(!h->sync)
+    if(!h->sync && !h->avctx->hwaccel)
         avpriv_color_frame(&pic->f, c);
 
     h->cur_pic_ptr = pic;



More information about the ffmpeg-cvslog mailing list