ffmpeg/tests/ref
Michael Niedermayer 79ae084e9b Merge remote-tracking branch 'qatar/master'
* qatar/master: (58 commits)
  amrnbdec: check frame size before decoding.
  cscd: use negative error values to indicate decode_init() failures.
  h264: prevent overreads in intra PCM decoding.
  FATE: do not decode audio in the nuv test.
  dxa: set audio stream time base using the sample rate
  psx-str: do not allow seeking by bytes
  asfdec: Do not set AVCodecContext.frame_size
  vqf: set packet parameters after av_new_packet()
  mpegaudiodec: use DSPUtil.butterflies_float().
  FATE: add mp3 test for sample that exhibited false overreads
  fate: add cdxl test for bit line plane arrangement
  vmnc: return error on decode_init() failure.
  libvorbis: add/update error messages
  libvorbis: use AVFifoBuffer for output packet buffer
  libvorbis: remove unneeded e_o_s check
  libvorbis: check return values for functions that can return errors
  libvorbis: use float input instead of s16
  libvorbis: do not flush libvorbis analysis if dsp state was not initialized
  libvorbis: use VBR by default, with default quality of 3
  libvorbis: fix use of minrate/maxrate AVOptions
  ...

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/dpxenc.c
	libavcodec/libvorbis.c
	libavcodec/vmnc.c
	libavformat/asfdec.c
	libavformat/id3v2enc.c
	libavformat/internal.h
	libavformat/mp3enc.c
	libavformat/utils.c
	libavformat/version.h
	libswscale/utils.c
	tests/fate/video.mak
	tests/ref/fate/nuv
	tests/ref/fate/prores-alpha
	tests/ref/lavf/ffm
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-01 03:17:11 +01:00
..
acodec Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
lavf Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
lavf-fate lavf-fate-ogg_vp3: Try -idct auto instead of -idct simple. 2012-02-18 21:45:07 +01:00
lavfi fate: disable deshake test as it isnt binary identical across archs. 2012-02-29 07:03:04 +01:00
seek rawdec: set timebase to 1/fps. 2012-02-26 07:30:21 +01:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00