aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-08-18 09:34:53 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-08-18 09:34:53 +0200
commit4b6ccccb03ba23ddf5478235fb7bae2d1fe3e952 (patch)
tree038b168b4110c697fe838d04ead67917e3fcc06a
parent316825f3e9d5f27ed31650928daba3f18bf06600 (diff)
parent58c3720a3cc71142b5d48d8ccdc9213f9a66cd33 (diff)
downloadffmpeg-4b6ccccb03ba23ddf5478235fb7bae2d1fe3e952.tar.gz
Merge commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33'
* commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33': fate: Make sure a corner-case for ASF is covered Adjusted fate ref to match the different timebase of the ffasf demuxer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r--tests/fate/microsoft.mak5
-rw-r--r--tests/ref/fate/asf-repldata15
2 files changed, 20 insertions, 0 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index 4e8ae51116..ead1b348f1 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -66,6 +66,11 @@ fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an
FATE_MICROSOFT-$(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_MICROSOFT-$(call DEMDEC, ASF, MPEG4) += $(FATE_ASF_REPLDATA)
+
FATE_MICROSOFT += $(FATE_MICROSOFT-yes)
FATE_SAMPLES_FFMPEG += $(FATE_MICROSOFT)
diff --git a/tests/ref/fate/asf-repldata b/tests/ref/fate/asf-repldata
new file mode 100644
index 0000000000..efd5457f95
--- /dev/null
+++ b/tests/ref/fate/asf-repldata
@@ -0,0 +1,15 @@
+#tb 0: 6/49
+0, 0, 0, 1, 460800, 0x85b053af
+0, 1, 1, 1, 460800, 0xfbdbb291
+0, 2, 2, 1, 460800, 0x1389b3d9
+0, 3, 3, 1, 460800, 0xc81e8326
+0, 4, 4, 1, 460800, 0xb0028333
+0, 5, 5, 1, 460800, 0x002b8619
+0, 6, 6, 1, 460800, 0xeb808d70
+0, 7, 7, 1, 460800, 0xe8288d27
+0, 8, 8, 1, 460800, 0xcfbe8bcc
+0, 9, 9, 1, 460800, 0x682b8d38
+0, 10, 10, 1, 460800, 0x5879cd04
+0, 11, 11, 1, 460800, 0x88a6a3e6
+0, 12, 12, 1, 460800, 0xc491db72
+0, 13, 13, 1, 460800, 0xb779d5cc \ No newline at end of file