ffmpeg/libavcodec
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
..
2011-11-25 13:19:54 +00:00
2012-02-20 15:08:41 -05:00
2012-01-14 01:17:06 +01:00
2012-01-14 17:23:57 +01:00
2011-09-16 05:53:14 +02:00
2012-01-12 16:32:55 +01:00
2011-11-12 20:01:05 +01:00
2012-01-14 04:47:27 +01:00
2011-11-12 20:01:50 +01:00
2012-02-29 01:41:18 +01:00
2012-02-29 21:18:54 +01:00
2012-01-28 21:59:01 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-05 00:02:31 +01:00
2012-01-14 01:15:42 +01:00
2011-12-10 11:58:03 +01:00
2012-02-24 03:30:42 +01:00
2012-02-02 18:44:52 +01:00
2011-10-10 02:58:18 +02:00
2011-09-24 21:11:01 +02:00
2011-09-25 21:16:55 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2011-12-23 05:58:32 +01:00
2012-01-26 19:54:38 +01:00
2012-02-19 03:57:54 +01:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2012-02-14 01:22:38 +01:00
2012-02-24 04:12:40 +01:00
2012-02-14 01:22:38 +01:00
2011-09-08 05:34:17 +02:00
2012-02-07 18:28:00 +01:00
2012-02-18 02:31:38 +01:00
2011-11-24 15:39:41 +01:00
2012-01-07 00:11:43 +01:00
2011-12-17 05:04:56 +01:00
2012-02-24 04:13:01 +01:00
2011-11-11 18:40:19 +01:00
2012-02-19 16:26:46 +01:00
2011-11-12 20:15:21 +01:00
2011-10-27 15:27:32 +02:00
2012-02-14 19:03:10 +01:00
2011-12-13 21:08:43 +01:00
2012-02-16 06:25:32 +01:00
2011-12-30 20:00:53 +01:00
2011-10-19 20:26:55 +02:00
2012-02-23 23:38:20 +01:00
2012-02-23 23:42:04 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-02-25 07:45:06 +01:00
2011-11-12 20:49:53 +01:00
2012-02-23 23:40:51 +01:00
2012-02-04 01:12:04 +01:00