[FFmpeg-cvslog] Merge commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct  3 23:36:25 2017 -0300| [9e009ee312ad25e91521d4c2043df879be56c989] | committer: James Almer

Merge commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4'

* commit 'e1a6d63c7eeff2f0ec8173546357bfaa9deecea4':
  fate: Rename WMV8_DRM decoder tests to WMV3_DRM

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e009ee312ad25e91521d4c2043df879be56c989
---

 tests/fate/microsoft.mak                          | 12 ++++++------
 tests/ref/fate/{wmv8-drm => wmv3-drm-dec}         |  0
 tests/ref/fate/{wmv8-drm-nodec => wmv3-drm-nodec} |  0
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index e24d2c5b44..c450c0d8ea 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -40,15 +40,15 @@ 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)/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)/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_MICROSOFT-$(call DEMDEC, ASF, WMV2) += fate-wmv8-x8intra
 fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an
diff --git a/tests/ref/fate/wmv8-drm b/tests/ref/fate/wmv3-drm-dec
similarity index 100%
rename from tests/ref/fate/wmv8-drm
rename to tests/ref/fate/wmv3-drm-dec
diff --git a/tests/ref/fate/wmv8-drm-nodec b/tests/ref/fate/wmv3-drm-nodec
similarity index 100%
rename from tests/ref/fate/wmv8-drm-nodec
rename to tests/ref/fate/wmv3-drm-nodec


======================================================================

diff --cc tests/fate/microsoft.mak
index e24d2c5b44,5c0133d8fd..c450c0d8ea
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@@ -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