virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'

Browse Source 
* commit 'd88738e4038b162708dc2f5342e10c1694edfd89':
  mpegvideo: Conditionally build error_resilience bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-08 15:17:15 +01:00
parent b094931ab9 d88738e403
commit 43c6c18690
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpegvideo.c
View File

@@ -3237,6 +3237,7 @@ void ff_MPV_report_decode_progress(MpegEncContext *s)
ff_thread_report_progress(&s->current_picture_ptr->f, s->mb_y, 0);
}
#if CONFIG_ERROR_RESILIENCE
void ff_mpeg_er_frame_start(MpegEncContext *s)
{
ERContext *er = &s->er;
@@ -3252,3 +3253,4 @@ void ff_mpeg_er_frame_start(MpegEncContext *s)
ff_er_frame_start(er);
}
#endif /* CONFIG_ERROR_RESILIENCE */