Michael Niedermayer
5c15b78e4a
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (42 commits)
swscale: fix signed overflow in yuv2mono_X_c_template
snow: fix integer overflows
svq1enc: remove stale altivec-related hack
snow: fix signed overflow in byte to 32-bit replication
adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
avformat: add CRI ADX format demuxer
adx: add an ADX parser.
adx: move header decoding to ADX common code
adx: calculate the number of blocks in a packet
adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
adx: check for unsupported ADX formats
adx: simplify encoding by using put_sbits()
adx: calculate correct LPC coeffs
adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
adx: simplify adx_decode() by using get_sbits() to read residual samples
adx: fix the data offset parsing in adx_decode_header()
adx: remove unneeded post-decode channel interleaving
adx: validate header values
adx: cosmetics: general pretty-printing and comment clean-up
adx: remove useless comments
...
Conflicts:
Changelog
libavcodec/cook.c
libavcodec/fraps.c
libavcodec/nuv.c
libavcodec/pthread.c
libavcodec/version.h
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-27 00:30:13 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-11-17 20:29:55 +01:00
2011-11-14 07:22:31 +01:00
2011-10-21 02:01:26 +02:00
2011-11-26 17:00:00 -05:00
2011-10-20 02:34:51 +02:00
2011-11-12 02:50:25 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-11-27 00:30:13 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-06-09 04:47:19 +02:00
2011-11-19 02:00:06 +01:00
2011-11-14 00:33:39 +01:00
2011-11-05 16:51:25 +01:00
2011-06-24 03:07:04 +02:00
2011-11-15 13:06:36 +01:00
2011-11-11 23:49:30 +01:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-11-08 10:35:14 +01:00
2011-11-11 02:50:35 +01:00
2011-11-23 04:02:17 +01:00
2011-11-06 11:52:57 +02:00
2011-10-01 03:48:33 +02:00
2011-11-14 00:33:39 +01:00
2011-11-24 15:03:27 +01:00
2011-11-19 02:00:06 +01:00
2011-11-14 00:33:39 +01:00
2011-11-03 02:16:26 +01:00
2011-09-08 22:37:31 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 07:22:31 +01:00
2011-11-14 07:22:30 +01:00
2011-11-08 00:36:45 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-08-01 00:58:49 +02:00
2011-11-03 20:22:10 +01:00
2011-08-22 09:35:58 +02:00
2011-11-24 03:32:24 +01:00
2011-11-14 00:33:39 +01:00
2011-11-24 03:32:24 +01:00
2011-11-13 13:14:39 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-30 01:33:41 +02:00
2011-07-17 20:12:02 +02:00
2011-11-03 02:16:26 +01:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-09-07 07:27:55 +02:00
2011-10-21 02:01:26 +02:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-11-02 10:43:39 +01:00
2011-10-20 02:34:51 +02:00
2011-09-07 02:36:42 +02:00
2011-11-08 17:39:39 +01:00
2011-11-03 02:16:26 +01:00
2011-11-24 03:32:24 +01:00
2011-11-14 07:22:31 +01:00
2011-10-29 22:08:25 +02:00
2011-10-13 06:00:03 +02:00
2011-11-14 00:33:39 +01:00
2011-11-02 19:36:04 -04:00
2011-11-01 18:41:46 +01:00
2011-09-28 18:13:52 +02:00
2011-11-22 18:57:01 +01:00
2011-11-11 02:50:35 +01:00
2011-11-12 02:50:25 +01:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2011-10-24 01:01:21 +02:00
2011-11-03 20:21:01 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-24 22:39:52 +02:00
2011-11-21 23:06:53 +01:00
2011-11-14 00:33:39 +01:00
2011-09-17 22:36:43 +02:00
2011-11-08 10:35:14 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 10:33:21 +01:00
2011-10-29 02:08:54 +02:00
2011-10-20 02:34:51 +02:00
2011-10-28 03:05:16 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-28 21:46:30 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-07-06 01:34:08 +02:00
2011-10-20 02:34:51 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-11-27 00:30:13 +01:00
2011-05-29 03:34:35 +02:00
2011-11-06 02:23:34 +01:00
2011-11-08 02:03:14 +01:00
2011-11-24 03:32:24 +01:00
2011-11-14 00:33:39 +01:00
2011-11-06 11:52:57 +02:00
2011-06-09 04:47:19 +02:00
2011-11-05 15:07:19 +01:00
2011-11-13 05:19:28 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-23 04:02:17 +01:00
2011-11-05 12:35:34 +02:00
2011-11-02 10:42:54 +01:00
2011-07-11 04:23:25 +02:00
2011-10-21 02:01:26 +02:00
2011-11-14 20:59:28 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-26 02:36:07 +02:00
2011-11-15 04:15:34 +01:00
2011-10-29 02:08:54 +02:00
2011-11-02 20:41:24 +01:00
2011-11-08 23:54:25 +01:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-27 22:27:52 +02:00
2011-11-18 15:33:44 +01:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-08 02:03:14 +01:00
2011-11-08 02:03:14 +01:00
2011-11-02 10:42:54 +01:00
2011-11-26 01:12:08 +01:00
2011-07-04 00:45:21 +02:00
2011-11-06 11:52:57 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-29 02:08:54 +02:00
2011-09-26 13:51:29 +02:00
2011-11-02 10:43:39 +01:00
2011-10-25 15:04:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-06-02 20:06:00 +01:00
2011-10-20 13:06:16 -04:00
2011-10-20 20:57:23 +02:00
2011-10-20 02:34:51 +02:00
2011-11-15 03:13:42 +01:00
2011-11-07 03:01:43 +01:00
2011-11-03 02:16:26 +01:00
2011-07-04 00:45:21 +02:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-18 22:34:41 +01:00
2011-09-17 22:36:43 +02:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-11-08 02:03:14 +01:00
2011-07-14 20:44:58 +02:00
2011-11-12 01:21:01 +01:00
2011-10-20 02:34:51 +02:00
2011-11-25 00:06:19 +01:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-11-19 02:00:06 +01:00
2011-10-18 01:54:40 +02:00
2011-09-27 02:14:37 +02:00
2011-09-08 22:37:31 +02:00
2011-11-07 21:55:34 +01:00
2011-11-07 21:55:34 +01:00
2011-11-07 03:01:43 +01:00
2011-11-06 11:52:57 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-11-19 02:00:06 +01:00
2011-11-19 02:00:06 +01:00
2011-11-14 00:33:39 +01:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-10-21 02:01:26 +02:00
2011-10-18 01:54:40 +02:00
2011-10-13 06:00:03 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-03 02:16:26 +01:00
2011-11-19 02:00:06 +01:00
2011-10-18 01:54:40 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-06-09 04:47:19 +02:00
2011-10-21 02:01:26 +02:00
2011-10-29 02:08:54 +02:00
2011-07-04 00:45:21 +02:00
2011-11-27 00:30:13 +01:00
2011-10-17 16:51:48 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-27 00:30:13 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-30 15:43:19 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-11-14 00:33:39 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-18 10:59:53 +02:00
2011-10-20 02:34:51 +02:00
2011-10-26 02:36:07 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-19 02:14:28 +01:00
2011-11-14 00:33:39 +01:00
2011-11-23 21:56:16 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-11-27 00:30:13 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-11-12 02:50:25 +01:00
2011-11-21 19:35:33 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-06 11:53:05 +02:00
2011-09-08 01:55:07 +02:00
2011-11-06 01:53:46 +01:00
2011-11-16 07:48:23 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
5c15b78e4a