[FFmpeg-cvslog] mpegvideo: Conditionally build error_resilience bits

Martin Storsjö git at videolan.org
Fri Mar 8 15:22:06 CET 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Mar  6 18:28:49 2013 +0100| [d88738e4038b162708dc2f5342e10c1694edfd89] | committer: Diego Biurrun

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d88738e4038b162708dc2f5342e10c1694edfd89
---

 libavcodec/mpegvideo.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 96cb6a7..7d880e4 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 */



More information about the ffmpeg-cvslog mailing list