diff options
| -rw-r--r-- | libavcodec/h264_picture.c | 18 | ||||
| -rw-r--r-- | libavcodec/h264_slice.c | 9 |
2 files changed, 18 insertions, 9 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index b6bdae491b..30ac65c8d5 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -197,8 +197,26 @@ int ff_h264_field_end(H264Context *h, int in_setup) * causes problems for the first MB line, too. */ if (!FIELD_PICTURE(h) && h->current_slice && !h->sps.new) { + int use_last_pic = h->last_pic_for_ec.f.buf[0] && !h->ref_count[0]; + ff_h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr); + + if (use_last_pic) { + ff_h264_set_erpic(&h->er.last_pic, &h->last_pic_for_ec); + COPY_PICTURE(&h->ref_list[0][0], &h->last_pic_for_ec); + } else if (h->ref_count[0]) { + ff_h264_set_erpic(&h->er.last_pic, &h->ref_list[0][0]); + } else + ff_h264_set_erpic(&h->er.last_pic, NULL); + + if (h->ref_count[1]) + ff_h264_set_erpic(&h->er.next_pic, &h->ref_list[1][0]); + + h->er.ref_count = h->ref_count[0]; + ff_er_frame_end(&h->er); + if (use_last_pic) + memset(&h->ref_list[0][0], 0, sizeof(h->last_pic_for_ec)); } #endif /* CONFIG_ERROR_RESILIENCE */ diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 05a6ccfa07..316a9ef054 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1986,15 +1986,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0) (h->ref_list[j][i].reference & 3); } - if (h->ref_count[0]) { - ff_h264_set_erpic(&h->er.last_pic, &h->ref_list[0][0]); - } else if (h->last_pic_for_ec.f.buf[0]) { - ff_h264_set_erpic(&h->er.last_pic, &h->last_pic_for_ec); - } - - if (h->ref_count[1]) ff_h264_set_erpic(&h->er.next_pic, &h->ref_list[1][0]); - - h->er.ref_count = h->ref_count[0]; h0->au_pps_id = pps_id; h->sps.new = h0->sps_buffers[h->pps.sps_id]->new = 0; |