diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:45:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:45:57 +0100 |
| commit | 076300bf8b43d5d56a91cd2ad845d596969c87cf (patch) | |
| tree | 487b8a917a0125e4cc086ccbcf575727ebb0b289 /tests/fate/vpx.mak | |
| parent | 7dc0ed80e877a16a11ba45d747723d88e8a92cd8 (diff) | |
| parent | bfe5454cd238b16e7977085f880205229103eccb (diff) | |
| download | ffmpeg-076300bf8b43d5d56a91cd2ad845d596969c87cf.tar.gz | |
Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
lavf: move "MP3 " fourcc from riff to nut
fate: vpx: Add dependencies
fate: Fix wavpack-matroskamode test dependencies
x86: dsputilenc: port to cpuflags
Conflicts:
libavformat/internal.h
libavformat/nut.c
tests/fate/vpx.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vpx.mak')
| -rw-r--r-- | tests/fate/vpx.mak | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index d3f9cc79ae..fd9c905b4e 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -1,34 +1,34 @@ -FATE_VP3 += fate-vp31 +FATE_VP3-$(CONFIG_AVI_DEMUXER) += fate-vp31 fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi -FATE_VP3 += fate-vp3-coeff-level64 +FATE_VP3-$(CONFIG_MATROSKA_DEMUXER) += fate-vp3-coeff-level64 fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv -FATE_SAMPLES_AVCONV += $(FATE_VP3) -fate-vp3: $(FATE_VP3) +FATE_SAMPLES_AVCONV-$(CONFIG_VP3_DECODER) += $(FATE_VP3-yes) +fate-vp3: $(FATE_VP3-yes) -FATE_SAMPLES_AVCONV += fate-vp5 +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VP5) += fate-vp5 fate-vp5: CMD = framecrc -i $(SAMPLES)/vp5/potter512-400-partial.avi -an -FATE_VP6 += fate-vp60 +FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp60 fate-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6 -FATE_VP6 += fate-vp61 +FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp61 fate-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 -FATE_VP6 += fate-vp6a +FATE_VP6-$(call DEMDEC, FLV, VP6A) += fate-vp6a fate-vp6a: CMD = framecrc -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv -FATE_VP6 += fate-vp6f +FATE_VP6-$(call DEMDEC, FLV, VP6F) += fate-vp6f fate-vp6f: CMD = framecrc -i $(SAMPLES)/flash-vp6/clip1024.flv -FATE_SAMPLES_AVCONV += $(FATE_VP6) -fate-vp6: $(FATE_VP6) +FATE_SAMPLES_AVCONV += $(FATE_VP6-yes) +fate-vp6: $(FATE_VP6-yes) VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 define FATE_VP8_SUITE -FATE_VP8 += fate-vp8-test-vector$(2)-$(1) +FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-test-vector$(2)-$(1) fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1) endef @@ -38,16 +38,16 @@ $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2)))) # FIXME this file contains two frames with identical timestamps, # so ffmpeg drops one of them -FATE_VP8 += fate-vp8-sign-bias$(1) +FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-sign-bias$(1) fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias -FATE_VP8 += fate-vp8-size-change$(1) +FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-size-change$(1) fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change endef $(eval $(call FATE_VP8_FULL)) $(eval $(call FATE_VP8_FULL,-emu-edge,-flags +emu_edge)) -FATE_SAMPLES_AVCONV += $(FATE_VP8) -fate-vp8: $(FATE_VP8) +FATE_SAMPLES_AVCONV-$(CONFIG_VP8_DECODER) += $(FATE_VP8-yes) +fate-vp8: $(FATE_VP8-yes) |