diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-29 18:13:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-29 18:13:00 +0200 |
| commit | 8579d4b2f0cc7d46dc75e0a0e42d556d653463fc (patch) | |
| tree | 8ab65fc1ed0ff0371f552430a33f5ebf57bc5dea /Makefile | |
| parent | 1c66807636ed8da5cf81d75cc8bb2726c6d6bc21 (diff) | |
| parent | 7baa115a33ab516c85ac94f6c5cdaee73e65ddf8 (diff) | |
| download | ffmpeg-streaming-8579d4b2f0cc7d46dc75e0a0e42d556d653463fc.zip ffmpeg-streaming-8579d4b2f0cc7d46dc75e0a0e42d556d653463fc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: export filtered -lz flag in config.mak
build: add separate setting for host linker
configure: probe_cc: use separate variable for linker output flag
x86: Always compile files with functions that are called unconditionally
x86: mpegvideoenc: fix linking with --disable-mmx
x86: mpegvideoenc: Do not abuse HAVE_ variables for template instantiation
Conflicts:
Makefile
configure
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -59,7 +59,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF) $(TOOLS): %$(EXESUF): %.o $(LD) $(LDFLAGS) $(LD_O) $< $(ELIBS) -tools/cws2fws$(EXESUF): ELIBS = -lz +tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) config.h: .config .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) |
