diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-16 23:00:11 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-16 23:00:11 +0200 |
commit | ba94e985a33d8e0feb545b09854e711a331c5343 (patch) | |
tree | 1611316e9a549e742219822c85dc72db7e92eae6 /tests/fate/video.mak | |
parent | 53fc900ca0d8964b522149ad959656ab7536a540 (diff) | |
parent | 1f84b008bf2b1eaca473937c48788cb4e4ce1aea (diff) | |
download | ffmpeg-ba94e985a33d8e0feb545b09854e711a331c5343.tar.gz |
Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'
* commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea':
fate: Move screenpresso to the appropriate screen capture file
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'tests/fate/video.mak')
-rw-r--r-- | tests/fate/video.mak | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index a0a70792e2..d128c7548f 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -286,9 +286,6 @@ fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an FATE_VIDEO-$(call DEMDEC, SMUSH, SANM) += fate-sanm fate-sanm: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24 -FATE_VIDEO-$(call DEMDEC, AVI, SCREENPRESSO) += fate-screenpresso -fate-screenpresso: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/bunny.avi - FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an |