diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:17:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:25:37 +0200 |
| commit | 1f5e5d2205df568f86371660b0991ec7087e94e6 (patch) | |
| tree | de4e14688195143baab7988797d3329904a92ee4 /tests/fate/cover-art.mak | |
| parent | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (diff) | |
| parent | ba13606ca6adbc74b4db4a72b0769397d6408791 (diff) | |
| download | ffmpeg-1f5e5d2205df568f86371660b0991ec7087e94e6.tar.gz | |
Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
fate: Add a --target-samples path parameter
Conflicts:
configure
tests/fate/audio.mak
tests/fate/cover-art.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/filter-video.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/prores.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vpx.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/cover-art.mak')
| -rw-r--r-- | tests/fate/cover-art.mak | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak index b175c3e88b..15745beb88 100644 --- a/tests/fate/cover-art.mak +++ b/tests/fate/cover-art.mak @@ -1,29 +1,29 @@ FATE_COVER_ART-$(CONFIG_APE_DEMUXER) += 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: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317 FATE_COVER_ART-$(CONFIG_FLAC_DEMUXER) += 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: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261 FATE_COVER_ART-$(CONFIG_MOV_DEMUXER) += 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: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma -fate-cover-art-wma: CMD = md5 -i $(SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo +fate-cover-art-wma: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-id3 -fate-cover-art-wma-id3: CMD = md5 -i $(SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma -an -c:v copy -f rawvideo +fate-cover-art-wma-id3: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma -an -c:v copy -f rawvideo fate-cover-art-wma-id3: REF = e6a8dd03687d5178bc13fc7d3316696e FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-metadatalib -fate-cover-art-wma-metadatalib: CMD = md5 -i $(SAMPLES)/cover_art/wma_with_metadata_library_object_tag_trimmed.wma -map 0:v -c:v copy -f rawvideo +fate-cover-art-wma-metadatalib: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_metadata_library_object_tag_trimmed.wma -map 0:v -c:v copy -f rawvideo fate-cover-art-wma-metadatalib: REF = 32e8bd4fad546f63d881a0256f083aea FATE_COVER_ART-$(CONFIG_WV_DEMUXER) += fate-cover-art-wv -fate-cover-art-wv: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo +fate-cover-art-wv: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317 FATE_COVER_ART = $(FATE_COVER_ART-yes) |