diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 22:41:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 22:58:04 +0200 |
| commit | 349c62410ba92b9513d4a31ec69cbf3ef5240555 (patch) | |
| tree | e14c0ee0b7ebadc38f86b7393db4d216447e3dd7 /tests | |
| parent | 432fe9a38afca9104c1c11942d21739e2a48ba96 (diff) | |
| parent | 4f04f5cc8b2a590217fe69492da3d65376ebcff3 (diff) | |
| download | ffmpeg-349c62410ba92b9513d4a31ec69cbf3ef5240555.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
indeo: Drop unused debug function ivi_check_band().
avcodec/utils: cast a function argument to shut up a compiler warning
truemotion1: remove disabled code
fix typo in comment
fate: fix dependencies for non-SAMPLES avconv tests
indeo: check for invalid motion vectors
indeo: check that band output buffer exists
indeo: clear allocated band buffers
indeo: track tile macroblock size
indeo: check custom Huffman tables for errors
factor out common decoding code for Indeo 4 and Indeo 5
mp3: fix start band index for block type 2 in 8kHz audio
lavf: change some (de)muxer names to lowercase
lavf: make output format matching case insensitive
Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/utils.c
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 10 | ||||
| -rw-r--r-- | tests/fate/video.mak | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/Makefile b/tests/Makefile index f872a0aa41..39a2ca919b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -86,16 +86,16 @@ FATE_LAVF = $(LAVF_TESTS:%=fate-lavf-%) FATE_LAVFI = $(LAVFI_TESTS:%=fate-lavfi-%) FATE_SEEK = $(SEEK_TESTS:seek_%=fate-seek-%) -FATE = $(FATE_ACODEC) \ - $(FATE_VCODEC) \ - $(FATE_LAVF) \ - $(FATE_SEEK) \ +FATE_AVCONV += $(FATE_ACODEC) \ + $(FATE_VCODEC) \ + $(FATE_LAVF) \ + $(FATE_LAVFI) \ + $(FATE_SEEK) \ FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) -FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI) FATE_SAMPLES-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) FATE_SAMPLES += $(FATE_SAMPLES-yes) diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 974cb8313e..8c42332156 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -119,7 +119,7 @@ FATE_VIDEO += fate-id-cin-video fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 FATE_VIDEO-$(CONFIG_AVFILTER) += fate-idroq-video-encode -fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2 +fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2 FATE_IFF += fate-iff-byterun1 fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 |