RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-03 11:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '6d4d3fee63c46d921c4870feab79269af94e84e1'

Browse Source 
* commit '6d4d3fee63c46d921c4870feab79269af94e84e1':
  h264: make sure the current picture is not made a long ref multiple times

See: 34ea5f418e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-27 20:41:21 +02:00
commit 77412f0ecd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/h264_refs.c
View File

@ -667,15 +667,18 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
remove_short_at_index(h, 0);
}
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);
/* make sure the current picture is not already assigned as a long ref */
if (h->cur_pic_ptr->long_ref) {
for (j = 0; j < FF_ARRAY_ELEMS(h->long_ref); j++) {
if (h->long_ref[j] == h->cur_pic_ptr) {
if (j != mmco[i].long_arg)
av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to 2 long term references\n");
}
remove_long(h, j, 0);
}
}
}
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);