diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:03:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 12:19:26 +0100 |
| commit | 2cf521718d9427329b9324b00fb59caddcf42782 (patch) | |
| tree | 3802359d7d10019217a6d63c5ada55c6373a8c96 /tests/fate/video.mak | |
| parent | c0f02b220182cc7997bd6b5279881b898f52dfbf (diff) | |
| parent | 35c6ce76b107225a19eb33aea38857d2405882af (diff) | |
| download | ffmpeg-2cf521718d9427329b9324b00fb59caddcf42782.tar.gz | |
Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
Canopus HQX decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/video.mak')
| -rw-r--r-- | tests/fate/video.mak | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 7e5416c91f..be1fe00655 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -57,6 +57,15 @@ FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO) FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an +FATE_CANOPUS_HQX += fate-canopus-hqx422 +fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix_fmt yuv422p16be -an + +FATE_CANOPUS_HQX += fate-canopus-hqx422a +fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an + +FATE_VIDEO-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX) +fate-canopus-hqx: $(FATE_CANOPUS_HQX) + FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an |