diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-04-10 00:04:19 +0400 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-04-10 20:07:52 +0400 |
commit | 9f48268c0d9e3a44184c203fed87291433fa6814 (patch) | |
tree | f59d3aae653fd6b74fb40bce02fa120cdd8393eb | |
parent | f7679c552ba2b11df703a3a7534f4e20593b958b (diff) |
Revert "h264: dont report rows as finished after a missing slice"lav0.56
This reverts commit 644092c8e8892f4f7e44a01b83487b398cafeb5a.
-rw-r--r-- | libavcodec/h264.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 22affd3dcf..4352884b77 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4225,7 +4225,7 @@ static void decode_finish_row(H264Context *h) ff_h264_draw_horiz_band(h, top, height); - if (h->droppable || h->er.error_occurred) + if (h->droppable) return; ff_thread_report_progress(&h->cur_pic_ptr->tf, top + height - 1, @@ -4256,16 +4256,6 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) avctx->codec_id != AV_CODEC_ID_H264 || (CONFIG_GRAY && (h->flags & CODEC_FLAG_GRAY)); - if (!(h->avctx->active_thread_type & FF_THREAD_SLICE)) { - const int start_i = av_clip(h->resync_mb_x + h->resync_mb_y * h->mb_width, 0, h->mb_num - 1); - if (start_i) { - int prev_status = h->er.error_status_table[h->er.mb_index2xy[start_i - 1]]; - prev_status &= ~ VP_START; - if (prev_status != (ER_MV_END | ER_DC_END | ER_AC_END)) - h->er.error_occurred = 1; - } - } - if (h->pps.cabac) { /* realign */ align_get_bits(&h->gb); |