[FFmpeg-cvslog] avcodec/h264_mb: assert that frame waiting code actually references 2 fields/1 frame

Michael Niedermayer git at videolan.org
Sat Apr 4 19:41:08 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  4 18:31:00 2015 +0200| [60e7d2d7b9eb55b65f6cae3135dc71c75777f03f] | committer: Michael Niedermayer

avcodec/h264_mb: assert that frame waiting code actually references 2 fields/1 frame

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

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

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

diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index 9036919..634d814 100644
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -176,6 +176,7 @@ static void await_references(const H264Context *h, H264SliceContext *sl)
                 nrefs[list]--;
 
                 if (!FIELD_PICTURE(h) && ref_field_picture) { // frame referencing two fields
+                    av_assert2((ref_pic->parent->reference & 3) == 3);
                     ff_thread_await_progress(&ref_pic->parent->tf,
                                              FFMIN((row >> 1) - !(row & 1),
                                                    pic_height - 1),



More information about the ffmpeg-cvslog mailing list