eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae'

Browse Source 
* commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae':
  fate: test only demuxing in asf-repldata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-08-24 10:25:41 +02:00
parent c864de3c8f faa3f17a76
commit 11014dd3d4
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/fate/microsoft.mak
+2 -4
View File
@@ -66,10 +66,8 @@ 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 -idct simple -i $(TARGET_SAMPLES)/asf/bug821-2.asf
FATE_MICROSOFT-$(call DEMDEC, ASF, MPEG4) += $(FATE_ASF_REPLDATA)
FATE_MICROSOFT-$(CONFIG_ASF_DEMUXER) += fate-asf-repldata
fate-asf-repldata: CMD = framecrc -i $(TARGET_SAMPLES)/asf/bug821-2.asf -c copy
FATE_MICROSOFT += $(FATE_MICROSOFT-yes)
tests/ref/fate/asf-repldata
+15 -15
View File
@@ -1,15 +1,15 @@
#tb 0: 6/49
0, 0, 0, 1, 460800, 0x1f8b53b0
0, 1, 1, 1, 460800, 0x95b6b292
0, 2, 2, 1, 460800, 0xad55b3da
0, 3, 3, 1, 460800, 0x61f98327
0, 4, 4, 1, 460800, 0x49dd8334
0, 5, 5, 1, 460800, 0x99f7861a
0, 6, 6, 1, 460800, 0x855b8d71
0, 7, 7, 1, 460800, 0x82038d28
0, 8, 8, 1, 460800, 0x69998bcd
0, 9, 9, 1, 460800, 0x02068d39
0, 10, 10, 1, 460800, 0xf245cd05
0, 11, 11, 1, 460800, 0x2281a3e7
0, 12, 12, 1, 460800, 0x5f01db74
0, 13, 13, 1, 460800, 0x51e9d5ce
#tb 0: 1/1000
0, 0, 0, 0, 23374, 0x8725b3b8
0, 122, 122, 0, 13732, 0x3ac8531a, F=0x0
0, 245, 245, 0, 615, 0xd31641b4, F=0x0
0, 367, 367, 0, 6361, 0xf263af54, F=0x0
0, 490, 490, 0, 320, 0xd6f2d6b8, F=0x0
0, 612, 612, 0, 3750, 0xfcf1d501, F=0x0
0, 735, 735, 0, 2541, 0xd9fc04f9, F=0x0
0, 857, 857, 0, 205, 0x4d38a947, F=0x0
0, 980, 980, 0, 2166, 0x2f1e7d74, F=0x0
0, 1102, 1102, 0, 1667, 0x0cd84b61, F=0x0
0, 1224, 1224, 0, 13645, 0x543bd032, F=0x0
0, 1347, 1347, 0, 5953, 0xc3037c73, F=0x0
0, 1469, 1469, 0, 36169, 0xca9f716d
0, 1592, 1592, 0, 3030, 0x9aba5683, F=0x0