1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/tests/fate
Michael Niedermayer 61930bd0d7 Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
  libxvid: Give more suitable names to libxvid-related files.
  libxvid: Separate libxvid encoder from libxvid rate control code.
  jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
  fate: cosmetics: lowercase some comments
  fate: Give more consistent names to some RealVideo/RealAudio tests.
  lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
  lavfi: add extended_data to AVFilterBuffer.
  lavc: check that extended_data is properly set in avcodec_encode_audio2().
  lavc: pad last audio frame with silence when needed.
  samplefmt: add a function for filling a buffer with silence.
  samplefmt: add a function for copying audio samples.
  lavr: do not try to copy to uninitialized output audio data.
  lavr: make avresample_read() with NULL output discard samples.
  fate: split idroq audio and video into separate tests
  fate: improve dependencies
  fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
  fate: split some combined tests into separate audio and video tests
  fate: fix dependencies for probe tests
  mips: intreadwrite: fix inline asm for gcc 4.8
  mips: intreadwrite: remove unnecessary inline asm
  ...

Conflicts:
	cmdutils.h
	configure
	doc/APIchanges
	doc/filters.texi
	ffmpeg.c
	ffplay.c
	libavcodec/internal.h
	libavcodec/jpeglsdec.c
	libavcodec/libschroedingerdec.c
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.h
	tests/Makefile
	tests/fate/aac.mak
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/image.mak
	tests/fate/libavutil.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/qt.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/vqf.mak
	tests/ref/fate/ea-mad
	tests/ref/fate/ea-tqi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-10 02:25:41 +02:00
..
aac.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
ac3.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
adpcm.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
als.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
amrnb.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
amrwb.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
atrac.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
audio.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
bmp.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
cdxl.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
dct.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
demux.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
dfa.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
dpcm.mak fate: split idroq audio and video into separate tests 2012-05-09 14:13:34 +01:00
ea.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
fft.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
h264.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
image.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
indeo.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
libavcodec.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
libavutil.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
lossless-audio.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
lossless-video.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
mapchan.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
microsoft.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
mp3.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
mpc.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
pcm.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
probe.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
prores.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
qt.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
qtrle.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
real.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
screen.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
utvideo.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
video.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
voice.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
vorbis.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00
vpx.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
vqf.mak Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
wavpack.mak fate: cosmetics: lowercase some comments 2012-05-09 18:12:28 +02:00
wma.mak fate: improve dependencies 2012-05-09 14:13:34 +01:00