diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-26 20:34:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-26 20:52:52 +0200 |
| commit | 7e496e154583b5fe11ccf04b833c418b22f05ca4 (patch) | |
| tree | 51ff1dc2484ab90ede1d715d30e935ce22b1af7d /Makefile | |
| parent | 60497cb984221268ef95d2b63476f4f3379fb7e2 (diff) | |
| parent | 72ccfb3cb7a85d35cfe2c99ab53e981974e599cd (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: ppc: drop stray leftover backslash
build: Only clean the architecture subdirectory we build for.
build: drop some unnecessary dependencies from the H.264 parser
build: prettyprinting cosmetics
libavutil: Remove pointless rational test program.
libavutil: Remove broken and pointless lzo test program.
lavf doxy: expand AVStream.codec doxy.
lavf doxy: improve AVStream.time_base doxy.
lavf doxy: add some basic documentation about reading from the demuxer.
lavf doxy: document passing options to demuxers.
lavf doxy: clarify that an AVPacket contains encoded data.
mpegtsenc: allow user triggered PES packet flushing
APIchanges: mark the place where 0.7 was cut.
APIchanges: mark the place where 0.8 was cut.
APIchanges: fill in missing dates and hashes.
smacker: convert palette and header reading to bytestream2.
alac: convert extradata reading to bytestream2.
Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -64,9 +64,10 @@ config.h: .config @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null -SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \ - ALTIVEC-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \ - HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS TOOLS +SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ + ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ + ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \ + OBJS TESTOBJS define RESET $(1) := |