diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 02:49:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 04:25:11 +0200 |
| commit | 3c033d00f5990e48b14f962d33c362f76695fb07 (patch) | |
| tree | 261e11fc02302638fd451f9f0d3741fc444cc28c /tests | |
| parent | 85761efa95fd7cfb104fb862a242691d4e7c345c (diff) | |
| parent | ce64e5bfd11ae63af0fb10317a2aea6f7501be62 (diff) | |
| download | ffmpeg-3c033d00f5990e48b14f962d33c362f76695fb07.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: introduce lowres and lowqual private options
FATE: add a test for flac cover art.
cafdec: allow larger ALAC magic cookie
alac: fix channel pointer assignment for 24 and 32-bit
Conflicts:
libavcodec/alac.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/cover-art.mak | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak index f35e9bb729..dadfcd8901 100644 --- a/tests/fate/cover-art.mak +++ b/tests/fate/cover-art.mak @@ -2,6 +2,10 @@ FATE_COVER_ART += fate-cover-art-ape fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317 +FATE_COVER_ART += fate-cover-art-flac +fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo +fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261 + FATE_COVER_ART += fate-cover-art-m4a fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e |