diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:03:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:03:05 +0100 |
| commit | 28eacd135162e34379b5c0146ad41a3601f35cd8 (patch) | |
| tree | 61835e7a9a60c0364efbf9a974dc83970c439a13 | |
| parent | dfd11eb2a5404d2b59073ebb8433f25c51ca084b (diff) | |
| parent | 58a868968df445068a143f327ced03b6a02baf0d (diff) | |
| download | ffmpeg-28eacd135162e34379b5c0146ad41a3601f35cd8.tar.gz | |
Merge commit '58a868968df445068a143f327ced03b6a02baf0d'
* commit '58a868968df445068a143f327ced03b6a02baf0d':
FATE: drop the last partial frame in the wmv8-drm test
Conflicts:
tests/ref/fate/wmv8-drm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/microsoft.mak | 2 | ||||
| -rw-r--r-- | tests/ref/fate/wmv8-drm | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 41954c0796..630dda8719 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -12,7 +12,7 @@ fate-msvideo1: $(FATE_MSVIDEO1) FATE_WMV8_DRM += fate-wmv8-drm # 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-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy diff --git a/tests/ref/fate/wmv8-drm b/tests/ref/fate/wmv8-drm index 31291d38ed..12d8fbb9aa 100644 --- a/tests/ref/fate/wmv8-drm +++ b/tests/ref/fate/wmv8-drm @@ -128,4 +128,3 @@ 0, 160, 160, 1, 84480, 0x13962590 0, 161, 161, 1, 84480, 0xde79482f 0, 162, 162, 1, 84480, 0x7d1ca064 -0, 163, 163, 1, 84480, 0x0998a064 |