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>

diff --cc tests/fate/microsoft.mak
index 4e8ae511166332383f82d8c60d14b06962addb7a,6f83d2ee7c0b1da011298aabf5054254028ce476..ead1b348f10d46ab25591c3b857a1caedd8e7b10
--- 1/tests/fate/microsoft.mak
--- 2/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@@ -63,10 -59,10 +63,15 @@@ fate-vc1_ilaced_twomv: CMD = framecrc -
  FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism
  fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an
  
 -FATE_SAMPLES_AVCONV-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
 +FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
  fate-vc1: $(FATE_VC1-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MPEG4) += $(FATE_ASF_REPLDATA)
+ 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)
 +fate-microsoft: $(FATE_MICROSOFT)

diff --cc tests/ref/fate/asf-repldata
index 0000000000000000000000000000000000000000,6a1dbaea33bbbc299d2d26c3eecfb267542271a3..efd5457f95e7f65ec4f726eb279013779d78f9d8
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/asf-repldata
+++ b/tests/ref/fate/asf-repldata
@@@ -1,0 -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
++#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