diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 21:01:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 21:01:07 +0200 |
| commit | fcb5849a62e5e6aac8fe6203443105f6dd46cbf6 (patch) | |
| tree | e1d13ab5500f969683a618b6031eb9b1156a3e8d /Makefile | |
| parent | af31d58a635b50da4132e0a00b00abb631a28a62 (diff) | |
| parent | 5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f (diff) | |
| download | ffmpeg-fcb5849a62e5e6aac8fe6203443105f6dd46cbf6.tar.gz | |
Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f'
* commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f':
build: add avresample after avcodec to FFLIBS
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -38,14 +38,15 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options TOOLS = qt-faststart trasher uncoded_frame TOOLS-$(CONFIG_ZLIB) += cws2fws -FFLIBS-$(CONFIG_AVDEVICE) += avdevice -FFLIBS-$(CONFIG_AVFILTER) += avfilter -FFLIBS-$(CONFIG_AVFORMAT) += avformat +# $(FFLIBS-yes) needs to be in linking order +FFLIBS-$(CONFIG_AVDEVICE) += avdevice +FFLIBS-$(CONFIG_AVFILTER) += avfilter +FFLIBS-$(CONFIG_AVFORMAT) += avformat +FFLIBS-$(CONFIG_AVCODEC) += avcodec FFLIBS-$(CONFIG_AVRESAMPLE) += avresample -FFLIBS-$(CONFIG_AVCODEC) += avcodec -FFLIBS-$(CONFIG_POSTPROC) += postproc -FFLIBS-$(CONFIG_SWRESAMPLE)+= swresample -FFLIBS-$(CONFIG_SWSCALE) += swscale +FFLIBS-$(CONFIG_POSTPROC) += postproc +FFLIBS-$(CONFIG_SWRESAMPLE) += swresample +FFLIBS-$(CONFIG_SWSCALE) += swscale FFLIBS := avutil |