diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 21:36:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 22:40:32 +0200 |
| commit | 3d7218d932923e2b964fef37e8993fd0a6df7c1d (patch) | |
| tree | 8d84104fd947b896e3879276a85c0f98f80fa191 /libavfilter | |
| parent | d90ba411aba28ebaced788f0810e082d9525bc13 (diff) | |
| parent | 449511740f06a4675b0066730fa45cdb764ffafc (diff) | |
| download | ffmpeg-3d7218d932923e2b964fef37e8993fd0a6df7c1d.tar.gz | |
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
build: handle library dependencies in configure
Conflicts:
common.mak
configure
libavdevice/Makefile
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 65786cf0c1..d61b69eebe 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -1,27 +1,6 @@ include $(SUBDIR)../config.mak NAME = avfilter -FFLIBS = avutil -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_DESHAKE_FILTER) += avcodec -FFLIBS-$(CONFIG_ELBG_FILTER) += avcodec -FFLIBS-$(CONFIG_MCDEINT_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 swscale -FFLIBS-$(CONFIG_RESAMPLE_FILTER) += avresample -FFLIBS-$(CONFIG_SAB_FILTER) += swscale -FFLIBS-$(CONFIG_SCALE_FILTER) += swscale -FFLIBS-$(CONFIG_SHOWSPECTRUM_FILTER) += avcodec -FFLIBS-$(CONFIG_SMARTBLUR_FILTER) += swscale -FFLIBS-$(CONFIG_SUBTITLES_FILTER) += avformat avcodec EBUR128LIBS-$(CONFIG_SWRESAMPLE) = swresample FFLIBS-$(CONFIG_EBUR128_FILTER) += $(EBUR128LIBS-yes) |