diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:28:13 +0200 |
| commit | 5a284d076ffdca705204e3e4100917cd4dbda14c (patch) | |
| tree | 409db710f32304c4192b2cebf4446bb0242b8189 /tests/fate/video.mak | |
| parent | fcca7671e29b67812d29af710ff90486944ee428 (diff) | |
| parent | 22526c1f557a72b3285d295bd8b30c40eb65d437 (diff) | |
| download | ffmpeg-streaming-5a284d076ffdca705204e3e4100917cd4dbda14c.zip ffmpeg-streaming-5a284d076ffdca705204e3e4100917cd4dbda14c.tar.gz | |
Merge commit '22526c1f557a72b3285d295bd8b30c40eb65d437'
* commit '22526c1f557a72b3285d295bd8b30c40eb65d437':
Canopus HQ/HQA decoder
Conflicts:
Changelog
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/video.mak')
| -rw-r--r-- | tests/fate/video.mak | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 08eae86..d07ff40 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -60,6 +60,18 @@ 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_HQ_HQA += fate-canopus-hq_hqa-hq +fate-canopus-hq_hqa-hq: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq.avi + +FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-hqa +fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi + +FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter +fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi + +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA) +fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA) + FATE_CANOPUS_HQX += fate-canopus-hqx422 fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix_fmt yuv422p16be -an |
