diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:19:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:40:42 +0200 |
| commit | d9cde3976c194688a1f7d16dcb4671eb11422876 (patch) | |
| tree | eebba4a91da9261f4cdbb58dbd45b344c3aa0164 /tests/Makefile | |
| parent | 53015bb3b340885d576af87afd20479ecb126bf4 (diff) | |
| parent | 2d2d6a4883479403798f4ed46941d5b365823570 (diff) | |
| download | ffmpeg-streaming-d9cde3976c194688a1f7d16dcb4671eb11422876.zip ffmpeg-streaming-d9cde3976c194688a1f7d16dcb4671eb11422876.tar.gz | |
Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'
* commit '2d2d6a4883479403798f4ed46941d5b365823570':
lavf: add a raw WavPack muxer.
apetag: add support for writing APE tags
matroskaenc: support muxing WavPack
Conflicts:
libavformat/Makefile
libavformat/allformats.c
libavformat/apetag.h
libavformat/version.h
libavformat/wvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 09a5e05..f551a90 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -63,6 +63,8 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) +DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER) + FILTERDEMDEC = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER) FILTERDEMDECMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_MUXER) FILTERDEMDECENCMUX = $(call ALLYES, $(1)_FILTER $(2)_DEMUXER $(3)_DECODER $(4)_ENCODER $(5)_MUXER) |
