[FFmpeg-cvslog] lavfi/Makefile: make FFLIBS list consistent.

Clément Bœsch git at videolan.org
Mon Dec 31 01:41:23 CET 2012


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Mon Dec 31 01:38:31 2012 +0100| [21b6991cd530bd207665e311ecd3d2e90171a1d8] | committer: Clément Bœsch

lavfi/Makefile: make FFLIBS list consistent.

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

 libavfilter/Makefile |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 34baa6d..c44f920 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -2,20 +2,19 @@ include $(SUBDIR)../config.mak
 
 NAME = avfilter
 FFLIBS = avutil
-FFLIBS-$(CONFIG_ASYNCTS_FILTER) += avresample
-FFLIBS-$(CONFIG_RESAMPLE_FILTER) += avresample
-FFLIBS-$(CONFIG_SCALE_FILTER)   += swscale
-
 FFLIBS-$(CONFIG_ACONVERT_FILTER)             += swresample
 FFLIBS-$(CONFIG_AMOVIE_FILTER)               += avformat avcodec
 FFLIBS-$(CONFIG_ARESAMPLE_FILTER)            += swresample
+FFLIBS-$(CONFIG_ASYNCTS_FILTER)              += avresample
 FFLIBS-$(CONFIG_ATEMPO_FILTER)               += avcodec
 FFLIBS-$(CONFIG_DECIMATE_FILTER)             += avcodec
 FFLIBS-$(CONFIG_MOVIE_FILTER)                += avformat avcodec
+FFLIBS-$(CONFIG_MP_FILTER)                   += avcodec
 FFLIBS-$(CONFIG_PAN_FILTER)                  += swresample
 FFLIBS-$(CONFIG_PP_FILTER)                   += postproc
 FFLIBS-$(CONFIG_REMOVELOGO_FILTER)           += avformat avcodec
-FFLIBS-$(CONFIG_MP_FILTER)                   += avcodec
+FFLIBS-$(CONFIG_RESAMPLE_FILTER)             += avresample
+FFLIBS-$(CONFIG_SCALE_FILTER)                += swscale
 FFLIBS-$(CONFIG_SMARTBLUR_FILTER)            += swscale
 
 HEADERS = asrc_abuffer.h                                                \



More information about the ffmpeg-cvslog mailing list