diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:58:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:58:14 +0200 |
| commit | 81ff0c24ef050c1877639ecc3ba6c485fde0a74e (patch) | |
| tree | 862e934366547cb8723d94f7f30953cb20d549b8 /tests/fate/screen.mak | |
| parent | 93f244e3abc3d75a797535a8da890bb1f9932433 (diff) | |
| parent | 1cd432e167b1a80853760c89a33606e2b5f229c2 (diff) | |
| download | ffmpeg-81ff0c24ef050c1877639ecc3ba6c485fde0a74e.tar.gz | |
Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
configure: fix libcdio check
rtsp: Allow setting the reordering buffer size via an AVOption
rtsp: Vertically align a constant definition
rtp: Update the check for distinguishing between RTP and RTCP
aac: fix build with hardcoded tables
fate: dependencies for screen codec tests
riff: Move functions around to be covered by appropriate #ifdefs
Conflicts:
configure
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/screen.mak')
| -rw-r--r-- | tests/fate/screen.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak index 14264a6547..b55e02b42b 100644 --- a/tests/fate/screen.mak +++ b/tests/fate/screen.mak @@ -1,8 +1,8 @@ # FIXME dropped frames in this test because of coarse timebase -FATE_SCREEN += fate-cscd +FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24 -FATE_SCREEN += fate-dxtory +FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory fate-dxtory: CMD = framecrc -i $(SAMPLES)/dxtory/dxtory_mic.avi FATE_FRAPS += fate-fraps-v0 @@ -23,7 +23,7 @@ fate-fraps-v4: CMD = framecrc -i $(SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nos FATE_FRAPS += fate-fraps-v5 fate-fraps-v5: CMD = framecrc -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -FATE_SCREEN += $(FATE_FRAPS) +FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS) fate-fraps: $(FATE_FRAPS) FATE_TSCC += fate-tscc-15bit @@ -32,7 +32,7 @@ fate-tscc-15bit: CMD = framecrc -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt FATE_TSCC += fate-tscc-32bit fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an -FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_TSCC) +FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC) fate-tscc: $(FATE_TSCC) FATE_VMNC += fate-vmnc-16bit @@ -41,7 +41,7 @@ fate-vmnc-16bit: CMD = framecrc -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24 FATE_VMNC += fate-vmnc-32bit fate-vmnc-32bit: CMD = framecrc -i $(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24 -FATE_SCREEN += $(FATE_VMNC) +FATE_SCREEN-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC) fate-vmnc: $(FATE_VMNC) FATE_ZMBV += fate-zmbv-8bit @@ -56,7 +56,7 @@ fate-zmbv-16bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 FATE_ZMBV += fate-zmbv-32bit fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 -FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_ZMBV) +FATE_SCREEN-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV) fate-zmbv: $(FATE_ZMBV) FATE_SCREEN += $(FATE_SCREEN-yes) |