summaryrefslogtreecommitdiff
path: root/libavcodec/h264_refs.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-31 00:18:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-31 00:18:23 +0100
commit34ea5f418ef815c629b6ab38a6a2711fd7463290 (patch)
tree901b3d734dd9190ff2c3ae503bc1280ec94aef73 /libavcodec/h264_refs.c
parent8b9059cfddce8b75487962fb60e5bd0c2a8073f8 (diff)
downloadffmpeg-34ea5f418ef815c629b6ab38a6a2711fd7463290.tar.gz
h264_refs: check for multiple mismatching long term ref assignments
Fixes failure of the assert added a few hours ago. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
-rw-r--r--libavcodec/h264_refs.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 9b16d1d747..4b69a90dd3 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -626,6 +626,14 @@ 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) {
+ if (h->cur_pic_ptr->long_ref) {
+ for(j=0; j<16; j++) {
+ if(h->long_ref[j] == h->cur_pic_ptr) {
+ remove_long(h, j, 0);
+ av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to 2 long term references\n");
+ }
+ }
+ }
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)) {