ffmpeg/libavcodec
Michael Niedermayer 51bfaa21c8 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  g722dec: check output buffer size before decoding
  g722dec: cosmetics: reindent/linewrap
  g722dec: remove the use of lowres for half-rate decoding.
  tta: check for extradata allocation failure in tta demuxer
  tta: check for allocation failure of decode_buffer
  tta: use correct frame_length calculation.
  tta: add support for decoding 24-bit sample format
  cosmetics: indentation
  tta: remove pointless braces
  tta: check output buffer size after adjusting frame length for last frame
  tta: fix reading of format in TTA header.
  tta: remove useless commented-out lines
  tta: check remaining bitstream size while reading unary value
  lavf: deprecate AVStream.stream_copy
  avconc: split choose_codec() to choose_decoder/choose_encoder.
  lavf: simplify by using FFMAX/FFMIN.
  mpegenc: add preload private option.
  cosmetics: simplify latm_decode_init
  latm: avoid unnecessary reinit of the aac decoder
  aacdec: initialize sbr context only in new channel elements
  ...

Conflicts:
	avconv.c
	libavcodec/resample.c
	libavcodec/tta.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-26 02:36:07 +02:00
..
2011-06-02 20:06:00 +01:00
2011-04-28 04:26:01 +02:00
2011-04-17 23:43:54 +02:00
2011-08-12 17:20:57 +02:00
2011-10-11 14:57:58 -04:00
2011-10-24 15:55:57 +02:00
2011-10-10 21:36:12 +02:00
2011-03-28 00:16:44 +02:00
2011-05-05 03:30:24 +02:00
2011-04-11 23:39:12 +02:00
2011-04-27 03:51:04 +02:00
2011-10-24 18:43:46 +02:00
2011-05-21 02:31:27 +02:00
2011-10-10 21:36:12 +02:00
2011-09-16 05:53:14 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-10-22 20:28:45 +02:00
2011-04-26 22:06:13 +02:00
2011-10-21 01:00:41 -07:00
2011-10-15 20:30:54 +02:00
2011-10-10 21:36:13 +02:00
2011-04-27 03:51:04 +02: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
2011-04-25 00:20:03 +02:00
2011-04-25 00:20:03 +02:00
2011-08-30 05:41:44 +02:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2011-05-11 05:47:02 +02:00
2011-10-21 01:00:41 -07:00
2011-04-27 03:51:04 +02:00
2011-05-24 01:31:53 +02:00
2011-09-28 18:43:49 +02:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-09-15 13:23:04 -07:00
2011-09-26 02:28:21 +02:00
2011-10-21 02:27:33 +02:00
2011-05-11 05:47:02 +02:00
2011-10-24 15:55:57 +02:00
2011-10-07 17:15:45 +02:00
2011-10-21 02:27:33 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2011-05-08 01:33:40 +02:00
2011-10-07 16:25:31 +02:00
2011-10-09 03:22:57 +02:00
2011-04-03 16:40:12 +02:00
2011-09-17 21:55:11 +02:00
2011-10-21 01:00:41 -07:00
2011-09-17 21:55:11 +02:00
2011-03-28 00:16:44 +02:00
2011-10-10 21:36:13 +02:00
2011-10-09 03:22:49 +02:00
2011-10-19 08:24:19 +02:00
2011-10-20 00:35:45 +02:00
2011-10-19 20:26:55 +02:00
2011-09-11 12:54:47 +02:00
2011-10-06 23:33:09 +02:00
2011-05-13 04:40:40 +02:00
2011-10-07 00:27:03 +02:00
2011-04-27 03:51:04 +02:00
2011-04-20 04:48:23 +02:00
2011-10-09 03:22:57 +02:00