diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:40:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:53:21 +0100 |
| commit | 98275283d52622c16a6d59f508de7d40216e8b63 (patch) | |
| tree | 873811e2460409fc82e7936b2137f86d7884a1b7 /tests/fate/video.mak | |
| parent | ca95d1b32df1a059be48404a3f1f598725a64d03 (diff) | |
| parent | 5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01 (diff) | |
| download | ffmpeg-98275283d52622c16a6d59f508de7d40216e8b63.tar.gz | |
Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'
* commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01':
FATE: add cavs test
cavsdec: export picture type in the output frame
Conflicts:
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 5689f51de9..f8725b6e3d 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -51,6 +51,9 @@ 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 $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an +FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs +fate-cavs: CMD = framecrc -i $(SAMPLES)/cavs/cavs.mpg -an + FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1 |