diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 12:30:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 12:30:32 +0100 |
| commit | 8bfc8d88be9be07c53aa290515d022c9a938e18d (patch) | |
| tree | 7baa8f8cf672b391fd7f4dd676f10900b6a47e29 /tests/fate | |
| parent | 3ac85bebd51c868e675c4c0d4361e400609e6f15 (diff) | |
| parent | ec86ba57312745fd7ad9771e3121e79c6aacba30 (diff) | |
| download | ffmpeg-8bfc8d88be9be07c53aa290515d022c9a938e18d.tar.gz | |
Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'
* commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30':
vp3: Fix double free in vp3_decode_end()
fate: Split fate-siff test into demuxer and VB video decoder test
Conflicts:
tests/fate/demux.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/demux.mak | 4 | ||||
| -rw-r--r-- | tests/fate/video.mak | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 721f2b9cb0..6ace25cd66 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -73,8 +73,8 @@ fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy -FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff -fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 +FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux +fate-siff-demux: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -c copy FATE_SAMPLES_DEMUX-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy diff --git a/tests/fate/video.mak b/tests/fate/video.mak index f8725b6e3d..d54b477ea6 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -254,6 +254,9 @@ FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc fate-v410enc: tests/vsynth1/00.pgm fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi +FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb +fate-vb: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an + FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1 fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an |