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