ffmpeg/tests
Michael Niedermayer b4178a3f13 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Support 'rtmp_live', an option which specifies if the media is a live stream.
  av_samples_fill_array: Mark unmodified function argument as const.
  lagarith: add YUY2 decoding support
  Support decoding unaligned rgb24 lagarith.
  dv: Split profile handling code into a separate file.
  flvenc: use AVFormatContext, not AVCodecContext for logging.
  mov: Remove write-only variable in mov_read_chan().
  fate: Change the probe-format refs to match the final text format committed.
  fate: Add avprobe as a make dependency
  Add probe fate tests to test for regressions in detecting media types.
  fate: Add oneline comparison method
  qdm2: clip array indices returned by qdm2_get_vlc().
  avplay: properly close/reopen AVAudioResampleContext on channel layout change
  avcodec: do not needlessly set packet size to 0 in avcodec_encode_audio2()
  avcodec: for audio encoding, reset output packet when it is not valid
  avcodec: refactor avcodec_encode_audio2() to merge common branches
  avcodec: remove fallbacks for AVCodec.encode() in avcodec_encode_audio2()

Conflicts:
	ffplay.c
	libavcodec/Makefile
	libavcodec/dvdata.c
	libavcodec/dvdata.h
	libavcodec/qdm2.c
	libavcodec/utils.c
	libavformat/flvenc.c
	libavformat/mov.c
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-08 22:02:59 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
ref aasc: use the correct reader offset 2012-05-08 16:53:03 +02:00
asynth1.sw movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
base64.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
codec-regression.sh Get rid of tests/data/asynth-%.sw rule. 2012-04-23 23:26:05 +02:00
copycooker.sh
fate_config.sh.template
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
fate-update.sh
fate-valgrind.supp Add a --valgrind configure option. 2012-01-21 12:04:46 +01:00
fate.sh fate: add support for specifying the shell used to run configure 2012-01-30 20:35:09 +01:00
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
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
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