ffmpeg/libavcodec
Michael Niedermayer 173715d291 Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
  libopencore-amr: check output buffer size before decoding
  libopencore-amr: remove unneeded buf_size==0 check.
  libopencore-amr: remove unneeded frame_count field.
  aac_latm: remove unneeded check for zero-size packet.
  pcmdec: fix output buffer size check by calculating the actual output size prior to decoding.
  pcmdec: move codec-specific variable declarations to the corresponding codec blocks.
  pcmdec: return buf_size instead of src-buf.
  avcodec: remove the Zork PCM encoder.
  pcm_zork: use AV_SAMPLE_FMT_U8 instead of shifting all samples by 8.
  pcmenc: remove unneeded sample_fmt check.
  pcmdec: move number of channels check to pcm_decode_init()
  pcmdec: remove unnecessary check for sample_fmt change
  pcmdec: move DVD PCM bits_per_coded_sample check near to the code that sets the sample size.
  pcmdec: do not needlessly set *data_size to 0
  alacdec: remove unneeded NULL or zero-size packet checks.
  alacdec: simplify buffer allocation by using FF_ALLOC_OR_GOTO()
  alacdec: ask for a sample for unsupported sample depths.
  alacdec: cosmetics: use 'ch' instead of 'chan' to iterate channels
  alacdec: move some declarations to the top of the function
  alacdec: always use get_sbits_long() for uncompressed samples
  ...

Conflicts:
	libavcodec/pcm.c
	tests/ref/acodec/pcm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 01:39:04 +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-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-10-26 14:32:01 +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-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-10-26 15:47:14 +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-10-27 00:00:29 +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