diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 12:22:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 12:23:34 +0200 |
| commit | 83bfcc3ce2554bd12d5eb790836530d3430bd908 (patch) | |
| tree | b56569d3f6225dcaadbfe66cc6aa3f6fa55f96e6 /tests/fate/cover-art.mak | |
| parent | 8778c49aceb99b3a9f5f1ce30d011755e12952a9 (diff) | |
| parent | 6b081eff4dfc3c899960f69f30cb567266b7dca3 (diff) | |
| download | ffmpeg-streaming-83bfcc3ce2554bd12d5eb790836530d3430bd908.zip ffmpeg-streaming-83bfcc3ce2554bd12d5eb790836530d3430bd908.tar.gz | |
Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'
* commit '6b081eff4dfc3c899960f69f30cb567266b7dca3':
fate: add vorbiscomment cover art test
Conflicts:
tests/fate/cover-art.mak
See: 1ca3902726fb8c1398ab00d146ebe3e2f31b76e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/cover-art.mak')
| -rw-r--r-- | tests/fate/cover-art.mak | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak index a40fc55..721c650 100644 --- a/tests/fate/cover-art.mak +++ b/tests/fate/cover-art.mak @@ -10,6 +10,10 @@ FATE_COVER_ART-$(CONFIG_MOV_DEMUXER) += fate-cover-art-m4a 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_OGG_DEMUXER) += fate-cover-art-ogg +fate-cover-art-ogg: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus -map 0:v -c:v copy -f rawvideo +fate-cover-art-ogg: REF = 7f117e073620eabb4ed02680cf70af41 + FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma 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 @@ -26,10 +30,6 @@ FATE_COVER_ART-$(CONFIG_WV_DEMUXER) += fate-cover-art-wv 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-$(CONFIG_OGG_DEMUXER) += fate-cover-art-ogg -fate-cover-art-ogg: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus -map 0:v -c:v copy -f rawvideo -fate-cover-art-ogg: REF = 7f117e073620eabb4ed02680cf70af41 - FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes) FATE_COVER_ART = $(FCA_TEMP-yes) |
