[FFmpeg-cvslog] h264: unmark frames at the end

Michael Niedermayer git at videolan.org
Sat Jan 19 06:24:55 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 19 06:18:24 2013 +0100| [96d1b7ffcab46dc40bd41afd7833a3380c53709c] | committer: Michael Niedermayer

h264: unmark frames at the end

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f43e99e..d2941ca 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4327,6 +4327,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
             h->delayed_pic[i] = h->delayed_pic[i + 1];
 
         if (out) {
+            out->f.reference &= ~DELAYED_PIC_REF;
             *got_frame = 1;
             *pict      = out->f;
         }



More information about the ffmpeg-cvslog mailing list