ffmpeg/tests
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
..
fate Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
ref Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
asynth1.sw
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
base64.c
codec-regression.sh Get rid of tests/data/asynth-%.sw rule. 2012-04-23 23:26:05 +02:00
copycooker.sh
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh
fate_config.sh.template
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +02:00
lavfi-regression.sh Merge remote-tracking branch 'qatar/master' 2012-04-14 22:37:43 +02:00
lena.pnm
md5.sh
regression-funcs.sh Get rid of tests/data/asynth-%.sw rule. 2012-04-23 23:26:05 +02:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
tiny_psnr.c tiny_psnr: reindent after last commit. 2012-04-15 15:46:46 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
videogen.c Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00