Merge commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4'
authorJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 02:36:25 +0000 (23:36 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 02:36:25 +0000 (23:36 -0300)
* commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4':
  fate: Rename WMV8_DRM decoder tests to WMV3_DRM

Merged-by: James Almer <jamrial@gmail.com>
1  2 
tests/fate/microsoft.mak
tests/ref/fate/wmv3-drm-dec
tests/ref/fate/wmv3-drm-nodec

@@@ -40,18 -34,18 +40,18 @@@ fate-msvideo1: $(FATE_MSVIDEO1
  FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += fate-mts2
  fate-mts2: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/ScreenCapture.xesc
  
- FATE_WMV8_DRM += fate-wmv8-drm
+ FATE_WMV3_DRM += fate-wmv3-drm-dec
  # discard last packet to avoid fails due to overread of VC-1 decoder
- fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
 -fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv3/wmv_drm.wmv -an -frames:v 129
++fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
  
- FATE_WMV8_DRM += fate-wmv8-drm-nodec
- fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -c:a copy -c:v copy
+ FATE_WMV3_DRM += fate-wmv3-drm-nodec
 -fate-wmv3-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv3/wmv_drm.wmv -c copy
++fate-wmv3-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -c:a copy -c:v copy
  
- FATE_MICROSOFT-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV8_DRM)
- fate-wmv8_drm: $(FATE_WMV8_DRM)
+ FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV3_DRM)
+ fate-wmv3-drm: $(FATE_WMV3_DRM)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV2) += fate-wmv8-intrax8
 -fate-wmv8-intrax8: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an
 +FATE_MICROSOFT-$(call DEMDEC, ASF, WMV2) += fate-wmv8-x8intra
 +fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an
  
  FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040
  fate-vc1_sa00040: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00040.vc1
Simple merge
Simple merge