diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:17:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:17:25 +0100 |
| commit | 43c6c1869011a4253841a99693e862ce57ecda5b (patch) | |
| tree | ed9a375820296210ec063bf7fdedcf17611c6ff2 | |
| parent | b094931ab91108950fec221291bebcbc7b0ac12a (diff) | |
| parent | d88738e4038b162708dc2f5342e10c1694edfd89 (diff) | |
| download | ffmpeg-43c6c1869011a4253841a99693e862ce57ecda5b.tar.gz | |
Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'
* commit 'd88738e4038b162708dc2f5342e10c1694edfd89':
mpegvideo: Conditionally build error_resilience bits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 66a7ed559e..60479d3350 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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 */ |