diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 13:45:40 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 14:14:21 +0200 |
| commit | 72ed8d8bd2e428a83bf3e52b38fc7b8e3e86f762 (patch) | |
| tree | 68000c978f756bb0f09cc75ecb48e701ea3ec150 /tests/fate | |
| parent | 2c2957e23f616123f6ab7f3d14ee0d172d50c382 (diff) | |
| parent | 1982d0cc561912d685a0c2dbe58bc19f50bae231 (diff) | |
| download | ffmpeg-72ed8d8bd2e428a83bf3e52b38fc7b8e3e86f762.tar.gz | |
Merge commit '1982d0cc561912d685a0c2dbe58bc19f50bae231'
* commit '1982d0cc561912d685a0c2dbe58bc19f50bae231':
fate: Add test for MTS2/MSS4
The timestamps differ because we use a more appropriate timebase.
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/microsoft.mak | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 524fb70160..2354f4d31c 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -37,6 +37,9 @@ fate-msvideo1-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/clock-cram16.avi - FATE_MICROSOFT-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1) 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 # 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 |