ffmpeg/tests
Michael Niedermayer 305e4b35ea Merge remote-tracking branch 'qatar/master'
* qatar/master: (34 commits)
  mlp_parser: fix the channel mask value used for the top surround channel
  vorbisenc: check all allocations for failure
  roqaudioenc: return AVERROR codes instead of -1
  roqaudioenc: set correct bit rate
  roqaudioenc: use AVCodecContext.frame_size correctly.
  roqaudioenc: remove unneeded sample_fmt check
  ra144enc: use int16_t* for input samples rather than void*
  ra144enc: set AVCodecContext.coded_frame
  ra144enc: remove unneeded sample_fmt check
  nellymoserenc: set AVCodecContext.coded_frame
  nellymoserenc: improve error checking in encode_init()
  nellymoserenc: return AVERROR codes instead of -1
  libvorbis: improve error checking in oggvorbis_encode_init()
  mpegaudioenc: return AVERROR codes instead of -1
  libfaac: improve error checking and handling in Faac_encode_init()
  avutil: add AVERROR_UNKNOWN
  check for coded_frame allocation failure in several audio encoders
  audio encoders: do not set coded_frame->key_frame.
  g722enc: check for trellis data allocation error
  libspeexenc: export encoder delay through AVCodecContext.delay
  ...

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/fraps.c
	libavcodec/kgv1dec.c
	libavcodec/libfaac.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/mlp_parser.c
	libavcodec/roqaudioenc.c
	libavcodec/vorbisenc.c
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-26 05:11:21 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-02-26 05:11:21 +01:00
ref Merge remote-tracking branch 'qatar/master' 2012-02-26 05:11:21 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-26 05:11:21 +01:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
copycooker.sh
fate-run.sh Add muxer test based on stream-copy from FATE sample. 2012-02-18 16:41:39 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh fate: add support for specifying the shell used to run configure 2012-01-30 20:35:09 +01:00
fate_config.sh.template
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Add regression test for "sox" format muxer/demuxer. 2012-02-21 14:42:30 -05:00
lavfi-regression.sh
lena.pnm
md5.sh
regression-funcs.sh Add muxer test based on stream-copy from FATE sample. 2012-02-18 16:41:39 +01:00
rotozoom.c
tiny_psnr.c
videogen.c