aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-10 00:38:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-10 01:20:07 +0100
commit8c6ebab747ca8311b81ff4d0a7c17ef60b372f32 (patch)
tree677444f33cd2ee65df88809ca820ed57d2077ca3 /tests/fate
parentea4037162fb0afa871e5312a7b23c828d2b85066 (diff)
parentc57fe49da8feda7d2e6c266978250a15a83e0484 (diff)
downloadffmpeg-8c6ebab747ca8311b81ff4d0a7c17ef60b372f32.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits) eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation yadif: specify array size outside DECLARE_ALIGNED prores: specify array size outside DECLARE_ALIGNED brackets. WavPack demuxer: set packet duration tta: use skip_bits_long() mxfdec: Ignore the last entry in Avid's index table segments mxfdec: Sanity-check SampleRate mxfdec: Handle small EditUnitByteCount mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index() mxfdec: Sanity check PreviousPartition mxfdec: Never seek back in local sets and KLVs mxfdec: Move the current_partition check inside mxf_read_header() mxfdec: Fix infinite loop in mxf_packet_timestamps() mxfdec: Check eof_reached in mxf_read_local_tags() mxfdec: Check for NULL component mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps() mxfdec: Make sure x < index_table->nb_ptses build: Add missing directories to DIRS declarations. ... Conflicts: doc/build_system.txt doc/fate.texi libavfilter/x86/yadif_template.c libavformat/mxfdec.c libavutil/Makefile tests/fate/audio.mak tests/fate/prores.mak tests/fate/screen.mak tests/fate/video.mak tests/ref/fate/bethsoft-vid tests/ref/fate/cscd tests/ref/fate/dfa4 tests/ref/fate/nuv tests/ref/fate/vp8-sign-bias tests/ref/fate/wmv8-drm tests/ref/lavf/gxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/audio.mak2
-rw-r--r--tests/fate/prores.mak1
-rw-r--r--tests/fate/screen.mak1
-rw-r--r--tests/fate/vpx.mak2
4 files changed, 4 insertions, 2 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index bad874b623..f694cb9bc3 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -32,4 +32,4 @@ FATE_AUDIO += fate-ws_snd
fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
FATE_TESTS += $(FATE_AUDIO)
-fate-audio: $(FATE_AUDIO)
+fate-audio: $(FATE_AUDIO) \ No newline at end of file
diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak
index 1890dac6e7..d211d3f4ae 100644
--- a/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
@@ -12,4 +12,3 @@ fate-prores-422_hq: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequ
fate-prores-422_lt: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
fate-prores-alpha: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le
-
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index 28fb9a93b8..1cc519dff8 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -1,3 +1,4 @@
+# FIXME dropped frames in this test because of coarse timebase
FATE_SCREEN += fate-cscd
fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 73dfab1732..f6823651f5 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -33,6 +33,8 @@ endef
define FATE_VP8_FULL
$(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
+# FIXME this file contains two frames with identical timestamps,
+# so avconv drops one of them
FATE_VP8 += fate-vp8-sign-bias$(1)
fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(SAMPLES)/vp8/sintel-signbias.ivf
fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias