[FFmpeg-cvslog] lavfi/Makefile: Don' t compile lavfutils.c and lswsutils.c if they are not needed

James Almer git at videolan.org
Sat Nov 30 13:42:21 CET 2013


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Nov 29 01:45:05 2013 -0300| [19e301b9eda7b22654fa8291ed4cc0f285a8acff] | committer: Michael Niedermayer

lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed

They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled

Signed-off-by: James Almer <jamrial at gmail.com>
Reviewed-by: Stefano Sabatini <stefasab at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/Makefile |    2 --
 1 file changed, 2 deletions(-)

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 7bd4323..3d8a763 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -49,8 +49,6 @@ OBJS = allfilters.o                                                     \
 
 
 OBJS-$(CONFIG_AVCODEC)                       += avcodec.o
-OBJS-$(CONFIG_AVFORMAT)                      += lavfutils.o
-OBJS-$(CONFIG_SWSCALE)                       += lswsutils.o
 
 OBJS-$(CONFIG_ACONVERT_FILTER)               += af_aconvert.o
 OBJS-$(CONFIG_ADELAY_FILTER)                 += af_adelay.o



More information about the ffmpeg-cvslog mailing list