From faa3f17a76333b672ce4a40cf80f678ab68bdbae Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Thu, 20 Aug 2015 14:46:42 +0200 Subject: [PATCH] fate: test only demuxing in asf-repldata --- tests/fate/microsoft.mak | 6 ++---- tests/ref/fate/asf-repldata | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 6f83d2ee7c..30bd35a1f3 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -62,7 +62,5 @@ fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an FATE_SAMPLES_AVCONV-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes) fate-vc1: $(FATE_VC1-yes) -FATE_ASF_REPLDATA += fate-asf-repldata -fate-asf-repldata: CMD = framecrc -i $(TARGET_SAMPLES)/asf/bug821-2.asf - -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MPEG4) += $(FATE_ASF_REPLDATA) +FATE_SAMPLES_AVCONV-$(CONFIG_ASF_DEMUXER) += fate-asf-repldata +fate-asf-repldata: CMD = framecrc -i $(TARGET_SAMPLES)/asf/bug821-2.asf -c copy diff --git a/tests/ref/fate/asf-repldata b/tests/ref/fate/asf-repldata index 6a1dbaea33..5abc9da02c 100644 --- a/tests/ref/fate/asf-repldata +++ b/tests/ref/fate/asf-repldata @@ -1,15 +1,15 @@ #tb 0: 1/1000 -0, 0, 0, 0, 460800, 0x85b053af -0, 122, 122, 0, 460800, 0xfbdbb291 -0, 245, 245, 0, 460800, 0x1389b3d9 -0, 367, 367, 0, 460800, 0xc81e8326 -0, 490, 490, 0, 460800, 0xb0028333 -0, 612, 612, 0, 460800, 0x002b8619 -0, 735, 735, 0, 460800, 0xeb808d70 -0, 857, 857, 0, 460800, 0xe8288d27 -0, 980, 980, 0, 460800, 0xcfbe8bcc -0, 1102, 1102, 0, 460800, 0x682b8d38 -0, 1224, 1224, 0, 460800, 0x5879cd04 -0, 1347, 1347, 0, 460800, 0x88a6a3e6 -0, 1469, 1469, 0, 460800, 0xc491db72 -0, 1592, 1592, 0, 460800, 0xb779d5cc +0, 0, 0, 0, 23374, 0x8725b3b8 +0, 122, 122, 0, 13732, 0x3ac8531a +0, 245, 245, 0, 615, 0xd31641b4 +0, 367, 367, 0, 6361, 0xf263af54 +0, 490, 490, 0, 320, 0xd6f2d6b8 +0, 612, 612, 0, 3750, 0xfcf1d501 +0, 735, 735, 0, 2541, 0xd9fc04f9 +0, 857, 857, 0, 205, 0x4d38a947 +0, 980, 980, 0, 2166, 0x2f1e7d74 +0, 1102, 1102, 0, 1667, 0x0cd84b61 +0, 1224, 1224, 0, 13645, 0x543bd032 +0, 1347, 1347, 0, 5953, 0xc3037c73 +0, 1469, 1469, 0, 36169, 0xca9f716d +0, 1592, 1592, 0, 3030, 0x9aba5683