Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33'

Browse Source 
* 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>
pull/146/head
Hendrik Leppkes 10 years ago
parent 316825f3e9 58c3720a3c
commit 4b6ccccb03
2 changed files with 20 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      tests/fate/microsoft.mak
  2. 15
      tests/ref/fate/asf-repldata

5
tests/fate/microsoft.mak
Unescape View File

@ -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)

15
tests/ref/fate/asf-repldata
Unescape View File

@ -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
Write Preview
Loading…
Cancel
Save