Commit 28eacd13 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '58a86896'

* commit '58a86896':
  FATE: drop the last partial frame in the wmv8-drm test

Conflicts:
	tests/ref/fate/wmv8-drm
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dfd11eb2 58a86896
...@@ -12,7 +12,7 @@ fate-msvideo1: $(FATE_MSVIDEO1) ...@@ -12,7 +12,7 @@ fate-msvideo1: $(FATE_MSVIDEO1)
FATE_WMV8_DRM += fate-wmv8-drm FATE_WMV8_DRM += fate-wmv8-drm
# discard last packet to avoid fails due to overread of VC-1 decoder # 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 -vframes 162 fate-wmv8-drm: 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 += fate-wmv8-drm-nodec
fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
......
...@@ -128,4 +128,3 @@ ...@@ -128,4 +128,3 @@
0, 160, 160, 1, 84480, 0x13962590 0, 160, 160, 1, 84480, 0x13962590
0, 161, 161, 1, 84480, 0xde79482f 0, 161, 161, 1, 84480, 0xde79482f
0, 162, 162, 1, 84480, 0x7d1ca064 0, 162, 162, 1, 84480, 0x7d1ca064
0, 163, 163, 1, 84480, 0x0998a064
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment