Michael Niedermayer
e4c00aca96
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (38 commits)
alac: cosmetics: general pretty-printing and comment clean up
alac: calculate buffer size outside the loop in allocate_buffers()
alac: change some data types to plain int
alac: cosmetics: rename some variables and function names
alac: multi-channel decoding support
alac: split element parsing into a separate function
alac: support a read sample size of up to 32
alac: output in planar sample format
alac: add 32-bit decoding support
alac: simplify channel interleaving
alac: use AVPacket fields directly in alac_decode_frame()
alac: fix check for valid max_samples_per_frame
alac: use get_sbits() to read LPC coefficients instead of casting
alac: move the current samples per frame to the ALACContext
alac: avoid using a double-negative when checking if the frame is compressed
alac: factor out output_size check in predictor_decompress_fir_adapt()
alac: factor out loading of next decoded sample in LPC prediction
alac: use index into buffer_out instead of incrementing the pointer
alac: simplify lpc coefficient adaptation
alac: reduce the number of local variables needed in lpc prediction
...
Conflicts:
libavcodec/alac.c
libavformat/cafdec.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-19 23:31:04 +02:00
2012-05-29 19:56:07 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-31 16:14:27 +02:00
2012-01-28 07:53:34 +01:00
2012-06-03 02:56:52 +02:00
2012-01-31 07:50:31 +01:00
2012-04-06 22:52:01 +02:00
2011-11-12 02:50:25 +01:00
2012-07-19 23:31:04 +02:00
2012-04-06 22:52:01 +02:00
2012-07-18 01:27:19 +02:00
2012-06-18 20:07:00 +02:00
2012-01-28 07:53:34 +01:00
2012-05-01 23:20:52 +02:00
2012-06-24 21:34:54 +02:00
2012-07-02 21:19:41 +02:00
2012-02-10 01:20:07 +01:00
2011-12-31 22:33:58 +01:00
2011-11-05 16:51:25 +01:00
2012-03-29 04:11:10 +02:00
2011-03-19 13:33:20 +00:00
2012-07-02 21:19:41 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-05-01 23:20:52 +02:00
2012-04-01 21:21:13 +02:00
2011-03-19 13:33:20 +00:00
2012-03-25 01:56:53 +01:00
2012-03-25 01:56:53 +01:00
2012-07-13 11:51:06 -04:00
2011-11-28 01:07:11 +01:00
2012-07-19 18:44:46 +02:00
2012-06-17 17:10:05 +02:00
2011-12-19 11:57:34 +01:00
2012-06-22 22:34:02 +02:00
2012-06-20 01:56:03 +00:00
2012-07-06 17:08:22 +02:00
2012-06-05 11:13:30 +02:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2012-03-03 00:23:10 +01:00
2012-02-17 00:35:06 +01:00
2012-01-28 07:53:34 +01:00
2012-06-09 10:57:14 +00:00
2012-06-09 14:36:41 +02:00
2012-01-28 07:53:34 +01:00
2012-03-03 04:30:49 +01:00
2012-04-06 19:19:59 +03:00
2012-02-16 01:34:37 +01:00
2012-02-06 02:04:09 +01:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2012-07-19 23:31:04 +02:00
2012-01-23 17:18:13 +01:00
2011-05-27 23:48:22 +02:00
2012-05-10 04:17:03 +02:00
2012-06-29 01:58:34 +00:00
2011-12-02 00:51:11 +01:00
2011-12-30 20:00:53 +01:00
2011-11-13 13:14:39 +01:00
2012-02-16 01:34:37 +01:00
2012-04-20 22:18:26 +02:00
2012-04-06 22:52:01 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-05-31 23:50:08 +02:00
2012-02-16 01:34:37 +01:00
2012-06-04 07:41:22 +02:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-05-05 20:22:09 +02:00
2011-08-09 19:56:25 +02:00
2012-05-07 02:42:00 +02:00
2012-06-16 17:59:01 +02:00
2011-05-22 04:53:19 +02:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2012-07-05 10:55:49 +02:00
2012-04-06 22:52:01 +02:00
2011-07-17 20:12:02 +02:00
2012-07-08 22:33:32 +02:00
2011-12-11 01:05:33 +01:00
2012-04-06 22:52:01 +02:00
2011-03-19 13:33:20 +00:00
2012-01-28 07:53:34 +01:00
2012-06-28 23:57:31 +02:00
2012-07-07 02:17:30 +02:00
2012-06-28 23:57:31 +02:00
2012-05-20 19:50:32 -04:00
2012-02-03 09:29:02 +01:00
2012-05-30 01:40:54 +02:00
2012-01-28 07:53:34 +01:00
2012-02-22 02:24:18 +01:00
2012-01-06 02:45:12 +01:00
2012-05-01 23:20:52 +02:00
2012-03-19 13:33:24 +01:00
2011-03-19 13:33:20 +00:00
2012-06-04 07:41:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-06-28 00:18:24 +02:00
2012-07-06 17:08:22 +02:00
2012-03-14 02:10:11 +01:00
2012-03-14 02:10:11 +01:00
2012-01-28 07:53:34 +01:00
2011-06-09 04:47:19 +02:00
2012-01-29 00:34:59 +01:00
2012-07-08 22:33:32 +02:00
2012-03-01 03:17:11 +01:00
2012-03-01 03:17:11 +01:00
2012-01-28 07:53:34 +01:00
2012-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-06-19 20:53:27 +02:00
2012-07-10 13:27:16 +02:00
2012-06-24 21:34:54 +02:00
2012-06-24 21:34:54 +02:00
2012-05-01 23:20:52 +02:00
2012-03-21 01:33:53 +01:00
2012-05-31 16:19:26 +02:00
2012-07-19 23:31:04 +02:00
2012-07-19 23:31:04 +02:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-06-21 22:37:43 +02:00
2012-04-06 22:52:01 +02:00
2012-06-29 20:19:59 +02:00
2012-05-03 19:37:14 +02:00
2012-07-03 09:53:42 +00:00
2012-04-14 18:21:19 +02:00
2012-07-05 13:02:49 +02:00
2012-01-28 07:53:34 +01:00
2012-05-21 08:51:50 +02:00
2012-06-04 00:33:42 +02:00
2012-01-28 07:53:34 +01:00
2012-02-01 02:36:09 +01:00
2012-03-31 12:37:42 +02:00
2011-05-27 23:48:22 +02:00
2012-07-18 01:27:19 +02:00
2011-05-24 23:34:24 +02:00
2012-03-01 03:17:11 +01:00
2012-07-09 22:40:12 +02:00
2012-07-13 17:03:57 +02:00
2012-05-21 23:53:39 +02:00
2011-12-02 00:51:11 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-03-26 20:03:57 +02:00
2012-06-29 20:20:01 +02:00
2011-04-04 01:29:40 +02:00
2012-01-28 07:53:34 +01:00
2012-03-23 00:50:49 +01:00
2012-05-01 23:20:52 +02:00
2011-04-20 04:48:23 +02:00
2011-12-12 01:25:37 +01:00
2012-01-06 02:45:12 +01:00
2012-06-20 20:47:46 +02:00
2012-07-19 13:26:45 -04:00
2012-07-19 13:26:45 -04:00
2012-07-19 23:31:04 +02:00
2012-07-14 02:57:11 +02:00
2012-06-11 07:35:14 +02:00
2012-05-26 22:37:37 +02:00
2012-07-14 17:20:22 +02:00
2012-07-14 17:20:22 +02:00
2012-06-27 01:58:09 +02:00
2012-04-06 22:52:01 +02:00
2012-07-16 20:45:41 +02:00
2011-03-19 13:33:20 +00:00
2012-05-06 21:53:19 +02:00
2012-06-19 20:53:27 +02:00
2012-02-29 00:30:35 +01:00
2012-06-13 18:51:38 +02:00
2012-03-09 22:25:32 +01:00
2012-03-10 18:32:02 +01:00
2012-01-28 07:53:34 +01:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-07-10 13:51:04 +02:00
2012-07-10 13:51:04 +02:00
2012-07-19 18:44:46 +02:00
2012-07-12 23:16:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-06-27 01:58:09 +02:00
2012-07-16 20:45:41 +02:00
2012-05-06 21:53:19 +02:00
2012-04-06 22:52:01 +02:00
2012-07-05 04:23:55 +02:00
2011-03-19 13:33:20 +00:00
2012-06-30 18:58:52 +02:00
2012-07-08 17:08:56 +02:00
2012-04-06 22:52:01 +02:00
2012-06-02 22:50:40 +02:00
2011-09-26 13:51:29 +02:00
2012-04-01 00:36:43 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2012-03-29 04:11:10 +02:00
2012-04-18 15:30:34 +02:00
2012-03-23 04:29:33 +01:00
2011-11-30 20:34:45 +01:00
2012-05-05 00:00:40 +02:00
2012-05-31 20:25:23 +02:00
2012-04-16 18:36:39 +02:00
2012-04-16 18:36:39 +02:00
2012-05-10 17:22:27 +02:00
2012-02-29 14:26:14 +01:00
2012-05-10 02:25:41 +02:00
2012-06-28 09:59:53 +02:00
2012-07-18 22:34:48 +02:00
2012-06-30 22:44:18 +02:00
2012-07-08 20:49:04 +00:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-06-14 23:52:23 +02:00
2011-09-24 22:39:52 +02:00
2012-02-28 07:20:36 +01:00
2012-03-04 04:26:04 +01:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2012-03-10 01:12:08 +01:00
2012-06-14 23:52:40 +02:00
2012-02-01 02:36:09 +01:00
2012-06-21 20:52:56 +02:00
2011-03-19 13:33:20 +00:00
2012-04-06 22:52:01 +02:00
2012-03-06 06:03:32 +01:00
2011-07-14 20:44:58 +02:00
2012-06-29 20:22:04 +02:00
2012-07-17 16:56:51 +02:00
2012-05-31 00:46:02 +02:00
2012-02-29 00:30:35 +01:00
2012-03-20 00:03:19 +01:00
2011-03-19 13:33:20 +00:00
2012-07-17 16:47:20 +02:00
2012-04-29 13:03:15 +02:00
2012-01-28 07:53:34 +01:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2012-05-01 23:20:52 +02:00
2011-11-29 00:20:29 +01:00
2012-07-18 01:27:19 +02:00
2012-07-18 01:27:19 +02:00
2012-06-15 00:14:21 +02:00
2012-06-15 00:14:21 +02:00
2012-07-18 01:27:19 +02:00
2012-02-24 02:57:18 +01:00
2012-07-04 00:32:31 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-06-19 20:53:27 +02:00
2011-12-02 00:51:11 +01:00
2012-06-14 22:11:43 +03:00
2012-02-19 01:47:10 +01:00
2012-06-20 20:47:46 +02:00
2012-06-19 20:53:27 +02:00
2012-04-08 20:55:11 +02:00
2012-07-06 17:08:22 +02:00
2012-02-07 01:40:29 +01:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2012-04-08 20:55:11 +02:00
2012-06-29 15:38:10 +03:00
2011-12-01 02:54:24 +01:00
2011-03-19 13:33:20 +00:00
2012-01-29 00:34:59 +01:00
2012-05-26 22:37:37 +02:00
2012-05-26 22:37:37 +02:00
2012-03-01 16:08:32 +02:00
2012-06-17 00:38:39 +02:00
2012-06-18 20:07:00 +02:00
2011-06-17 05:49:58 +02:00
2012-01-29 00:34:59 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-06-19 20:53:27 +02:00
2012-06-18 20:07:00 +02:00
2012-06-20 20:47:46 +02:00
2012-07-11 23:57:11 +02:00
2012-07-11 23:57:11 +02:00
2012-07-11 23:57:11 +02:00
2012-07-11 23:57:11 +02:00
2012-06-20 20:47:46 +02:00
2012-06-29 20:21:28 +02:00
2012-06-20 20:47:46 +02:00
2012-05-26 22:37:37 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2012-02-23 16:00:22 +01:00
2012-06-26 17:22:21 +03:00
2012-06-19 20:53:27 +02:00
2012-05-04 14:40:22 +02:00
2012-03-06 06:03:32 +01:00
2012-03-06 06:03:32 +01:00
2012-04-16 02:18:09 +02:00
2012-07-10 00:53:01 +02:00
2012-01-28 07:53:34 +01:00
2012-04-06 22:52:01 +02:00
2012-04-22 11:23:58 +02:00
2012-01-17 02:37:30 +01:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00
2012-07-08 20:49:35 +00:00
2012-05-01 23:20:52 +02:00
2011-03-19 13:33:20 +00:00
2012-05-01 23:20:52 +02:00
2011-12-12 01:25:37 +01:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-06-15 18:40:14 +02:00
2012-06-21 20:52:56 +02:00
2012-06-29 20:20:02 +02:00
2012-06-29 20:20:02 +02:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2012-06-07 21:30:07 +02:00
2012-07-09 22:40:12 +02:00
2012-03-04 04:26:04 +01:00
2012-03-04 04:26:04 +01:00
2012-01-05 23:56:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-07-19 22:48:09 +02:00
2012-06-01 14:47:30 +02:00
2012-07-18 18:08:57 +02:00
2012-04-06 22:52:01 +02:00
2011-12-30 20:00:53 +01:00
2012-07-18 01:27:19 +02:00
2011-03-19 13:33:20 +00:00
2012-02-16 01:34:37 +01:00
2012-04-06 22:52:01 +02:00
2012-06-25 03:45:29 +02:00
2011-06-09 04:47:19 +02:00
2011-12-13 00:39:48 +01:00
2012-03-04 04:26:04 +01:00
2012-05-21 23:53:39 +02:00
2012-01-28 07:53:34 +01:00
2012-02-01 04:43:06 +01:00
2012-03-27 11:58:15 -04:00
2012-06-25 16:20:08 +03:00
2011-09-08 01:55:07 +02:00
2012-07-06 17:08:22 +02:00
2011-12-03 03:24:32 +01:00
2012-02-10 01:20:07 +01:00
2012-03-21 01:33:53 +01:00
2012-07-06 17:08:22 +02:00
2012-03-22 23:16:49 +01:00
2012-05-31 14:47:15 +02:00
2012-05-08 16:53:03 +02:00
e4c00aca96