aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-03-06 18:28:49 +0100
committerDiego Biurrun <diego@biurrun.de>2013-03-07 15:04:49 +0100
commitd88738e4038b162708dc2f5342e10c1694edfd89 (patch)
treef826a07879a9dc8411ad6de8d70f19d51c20f35b
parent06b54e84254e4834b4978ff5b27cc2b7ee8d7a98 (diff)
downloadffmpeg-d88738e4038b162708dc2f5342e10c1694edfd89.tar.gz
mpegvideo: Conditionally build error_resilience bits
This breaks the dependency of mpegvideo on error_resilience allowing compilation of components that depend on the former w/o the latter.
-rw-r--r--libavcodec/mpegvideo.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 96cb6a7ae5..7d880e4131 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2856,6 +2856,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;
@@ -2871,3 +2872,4 @@ void ff_mpeg_er_frame_start(MpegEncContext *s)
ff_er_frame_start(er);
}
+#endif /* CONFIG_ERROR_RESILIENCE */