[FFmpeg-cvslog] h264_refs: assert that long ref fields have not been inserted multiple times

Michael Niedermayer git at videolan.org
Sat Mar 30 20:42:54 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 30 17:21:42 2013 +0100| [fbb6741a84ef975e42a9e4da2c32735f4c77686d] | committer: Michael Niedermayer

h264_refs: assert that long ref fields have not been inserted multiple times

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

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

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

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 44d84d1..d83758d 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -625,6 +625,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
                      */
 
             if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) {
+                av_assert0(!h->cur_pic_ptr->long_ref);
                 remove_long(h, mmco[i].long_arg, 0);
                 if (remove_short(h, h->cur_pic_ptr->frame_num, 0)) {
                     av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to short and long at the same time\n");



More information about the ffmpeg-cvslog mailing list