diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-06-20 06:05:45 -0700 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-06-22 17:36:37 -0700 |
commit | 7b9ef8d701c319c26f7d0664fe977e176764c74e (patch) | |
tree | 651afd8b680afd86e1aca7d6c89fe27514bb9d20 /libavcodec/mpegvideo.c | |
parent | f2f2e7627f0c878d13275af5d166ec5932665e28 (diff) | |
download | ffmpeg-7b9ef8d701c319c26f7d0664fe977e176764c74e.tar.gz |
mpeg: Split error resilience bits off into a separate file
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f32aad2382..f602dd6f23 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -2466,43 +2466,3 @@ void ff_MPV_report_decode_progress(MpegEncContext *s) if (s->pict_type != AV_PICTURE_TYPE_B && !s->partitioned_frame && !s->er.error_occurred) ff_thread_report_progress(&s->current_picture_ptr->tf, s->mb_y, 0); } - -#if CONFIG_ERROR_RESILIENCE -static void set_erpic(ERPicture *dst, Picture *src) -{ - int i; - - if (!src) { - dst->f = NULL; - dst->tf = NULL; - return; - } - - dst->f = src->f; - dst->tf = &src->tf; - - for (i = 0; i < 2; i++) { - dst->motion_val[i] = src->motion_val[i]; - dst->ref_index[i] = src->ref_index[i]; - } - - dst->mb_type = src->mb_type; - dst->field_picture = src->field_picture; -} - -void ff_mpeg_er_frame_start(MpegEncContext *s) -{ - ERContext *er = &s->er; - - set_erpic(&er->cur_pic, s->current_picture_ptr); - set_erpic(&er->next_pic, s->next_picture_ptr); - set_erpic(&er->last_pic, s->last_picture_ptr); - - er->pp_time = s->pp_time; - er->pb_time = s->pb_time; - er->quarter_sample = s->quarter_sample; - er->partitioned_frame = s->partitioned_frame; - - ff_er_frame_start(er); -} -#endif /* CONFIG_ERROR_RESILIENCE */ |