RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/h264_slice: use ff_h264_replace_picture when syncing thread contexts 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-08-08 18:20:44 -03:00
parent a2a5a579bc
commit 90bf83d6f1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264_slice.c
View File

@ -379,19 +379,15 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
h->droppable = h1->droppable;
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) {
ff_h264_unref_picture(h, &h->DPB[i]);
if (h1->DPB[i].f->buf[0] &&
(ret = ff_h264_ref_picture(h, &h->DPB[i], &h1->DPB[i])) < 0)
ret = ff_h264_replace_picture(h, &h->DPB[i], &h1->DPB[i]);
if (ret < 0)
return ret;
}
h->cur_pic_ptr = REBASE_PICTURE(h1->cur_pic_ptr, h, h1);
ff_h264_unref_picture(h, &h->cur_pic);
if (h1->cur_pic.f->buf[0]) {
ret = ff_h264_ref_picture(h, &h->cur_pic, &h1->cur_pic);
if (ret < 0)
return ret;
}
ret = ff_h264_replace_picture(h, &h->cur_pic, &h1->cur_pic);
if (ret < 0)
return ret;
h->enable_er = h1->enable_er;
h->workaround_bugs = h1->workaround_bugs;