Michael Niedermayer
bbb61a1cd5
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (22 commits)
als: prevent infinite loop in zero_remaining().
cook: prevent div-by-zero if channels is zero.
pamenc: switch to encode2().
svq1enc: switch to encode2().
dvenc: switch to encode2().
dpxenc: switch to encode2().
pngenc: switch to encode2().
v210enc: switch to encode2().
xwdenc: switch to encode2().
ttadec: use branchless unsigned-to-signed unfolding
avcodec: add a Sun Rasterfile encoder
sunrast: Move common defines to a new header file.
cdxl: fix video decoding for some files
cdxl: fix audio for some samples
apetag: add proper support for binary tags
ttadec: remove dead code
swscale: make access to filter data conditional on filter type.
swscale: update context offsets after removal of AlpMmxFilter.
prores: initialise encoder and decoder parts only when needed
swscale: make monowhite/black RGB-independent.
...
Conflicts:
Changelog
libavcodec/alsdec.c
libavcodec/dpxenc.c
libavcodec/golomb.h
libavcodec/pamenc.c
libavcodec/pngenc.c
libavformat/img2.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 21:36:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 16:22:25 +01:00
2012-02-11 01:22:22 +01:00
2012-01-24 02:41:53 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-01-24 02:41:53 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 16:36:02 -08:00
2012-02-16 01:34:37 +01:00
2012-02-02 02:24:09 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2011-12-18 14:22:13 +01:00
2012-01-24 22:53:59 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-03 16:28:17 -05:00
2012-01-03 16:28:17 -05:00
2012-01-05 02:03:12 +01:00
2012-01-28 20:14:20 +01:00
2012-01-14 01:17:06 +01:00
2012-02-12 01:06:13 +01:00
2012-02-18 02:20:19 +01:00
2012-02-17 12:35:08 -08:00
2012-01-29 00:34:59 +01:00
2012-01-06 02:45:12 +01:00
2012-02-11 08:23:42 +01:00
2012-02-16 01:34:37 +01:00
2012-01-30 23:28:26 +01:00
2012-01-30 23:28:36 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-02-15 01:52:14 +01:00
2012-01-14 17:23:57 +01:00
2011-12-26 04:10:47 +01:00
2012-02-17 00:35:06 +01:00
2012-01-09 00:32:38 +01:00
2012-01-02 03:10:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-03 03:25:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 16:32:55 +01:00
2012-02-13 02:06:44 +01:00
2012-01-03 03:06:45 +01:00
2012-02-10 01:20:07 +01:00
2012-01-14 04:51:13 +01:00
2012-01-14 04:47:27 +01:00
2012-01-14 02:22:09 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-13 02:06:44 +01:00
2012-02-18 02:20:19 +01:00
2012-01-22 23:40:24 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 06:15:40 +01:00
2012-01-04 01:12:34 +01:00
2012-01-28 21:59:01 +01:00
2012-02-16 23:01:47 +01:00
2012-02-16 03:05:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-26 17:05:57 +01:00
2012-01-14 01:15:42 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-01-29 14:52:56 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-09 19:16:15 -08:00
2012-02-05 02:08:03 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-10 01:20:07 +01:00
2012-01-28 22:01:05 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2011-12-23 03:25:51 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-07 01:40:29 +01:00
2012-01-03 03:25:22 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-02 18:44:52 +01:00
2012-01-15 01:16:54 +01:00
2012-01-07 13:38:23 -05:00
2012-01-28 07:53:34 +01:00
2012-02-16 23:25:51 +01:00
2012-02-16 01:34:37 +01:00
2012-02-02 02:24:09 +01:00
2012-02-18 02:20:19 +01:00
2012-01-11 08:56:24 -05:00
2012-02-01 04:43:06 +01:00
2012-01-12 01:10:32 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-01-15 01:16:54 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2011-12-23 05:58:32 +01:00
2012-01-01 21:43:44 +01:00
2012-01-26 19:54:38 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 01:22:38 +01:00
2012-02-16 01:34:37 +01:00
2012-02-09 01:27:12 +01:00
2011-12-23 03:25:51 +01:00
2011-12-23 03:25:51 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 13:54:41 +01:00
2012-01-12 13:54:41 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-12-31 01:16:45 +01:00
2011-12-29 01:40:34 +01:00
2011-12-29 01:40:34 +01:00
2012-01-13 19:51:19 +01:00
2012-01-12 16:32:55 +01:00
2012-02-15 22:06:38 +02:00
2012-02-06 19:39:24 +01:00
2012-02-14 01:22:38 +01:00
2012-02-14 01:22:38 +01:00
2012-02-15 22:06:46 +02:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 10:16:23 -08:00
2012-01-31 02:46:26 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-12-31 16:31:15 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:26:31 +01:00
2011-12-20 19:08:04 +01:00
2012-01-08 03:34:22 +01:00
2012-01-25 03:51:49 +01:00
2012-01-28 23:21:03 +01:00
2012-01-28 22:08:20 +01:00
2012-01-28 22:08:20 +01:00
2012-02-01 15:51:18 +01:00
2012-01-19 23:31:22 +01:00
2012-01-08 03:34:22 +01:00
2012-01-28 07:53:34 +01:00
2012-02-09 23:55:33 +01:00
2012-02-07 18:28:00 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2011-12-31 16:47:17 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 18:11:40 +01:00
2012-02-09 01:27:12 +01:00
2012-01-29 00:34:59 +01:00
2012-02-04 05:18:45 +01:00
2012-01-08 03:34:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-02-18 02:20:19 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-07 00:11:43 +01:00
2012-01-28 07:53:34 +01:00
2012-02-16 01:34:37 +01:00
2012-01-06 00:51:31 +01:00
2012-02-16 01:34:37 +01:00
2011-12-30 22:32:42 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-01-26 02:23:56 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-31 02:46:26 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 07:53:34 +01:00
2012-02-05 01:34:59 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-11 01:22:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 01:10:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-12 01:10:32 +01:00
2012-02-14 01:53:31 +01:00
2012-01-29 00:34:59 +01:00
2012-01-03 03:25:22 +01:00
2012-01-27 17:19:09 -08:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 01:53:31 +01:00
2012-02-18 02:20:19 +01:00
2012-02-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-02-07 15:48:33 +01:00
2011-12-27 23:51:02 +01:00
2012-01-30 11:25:59 +01:00
2012-01-17 02:37:30 +01:00
2012-01-22 00:46:19 +01:00
2012-01-30 05:20:58 +01:00
2012-01-31 21:40:53 +01:00
2012-01-30 05:20:58 +01:00
2012-02-10 23:18:52 +01:00
2012-02-18 02:20:19 +01:00
2012-01-23 01:05:20 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2012-02-15 07:14:45 +01:00
2012-02-15 07:14:45 +01:00
2012-02-16 19:55:16 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 16:49:30 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 00:37:17 +01:00
2012-02-17 00:35:06 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 02:41:53 +01:00
2012-02-12 20:24:29 +01:00
2011-12-20 04:12:09 +01:00
2012-01-26 22:28:25 +01:00
2011-12-29 15:21:02 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 20:11:33 +01:00
2012-01-28 22:08:20 +01:00
2012-02-17 22:38:30 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-01-22 06:46:24 +01:00
2012-01-29 00:34:59 +01:00
2012-02-09 23:25:46 +01:00
2012-02-09 01:27:12 +01:00
2012-02-10 01:20:07 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 22:08:21 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-14 19:03:10 +01:00
2012-02-16 01:34:37 +01:00
2012-02-15 01:52:14 +01:00
2012-02-16 01:34:37 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 14:56:18 +00:00
2012-01-28 14:56:18 +00:00
2012-01-29 00:34:59 +01:00
2012-01-19 23:31:22 +01:00
2012-02-17 00:35:06 +01:00
2012-02-01 04:43:06 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-02-18 02:20:19 +01:00
2012-01-05 22:24:51 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 06:25:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2011-12-30 20:00:53 +01:00
2012-02-18 02:20:19 +01:00
2012-02-17 14:28:56 -05:00
2012-02-17 14:28:56 -05:00
2012-02-16 01:34:37 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-01-28 01:36:42 +01:00
2011-12-23 03:25:51 +01:00
2012-01-22 04:49:46 +01:00
2012-01-11 11:15:05 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 14:31:17 +01:00
2012-02-02 14:31:17 +01:00
2011-12-19 02:34:18 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-06 08:00:31 +01:00
2012-02-18 02:20:19 +01:00
2012-01-28 22:08:21 +01:00
2012-01-04 19:45:46 +01:00
2012-01-04 19:45:46 +01:00
2012-02-06 00:29:32 +01:00
2012-02-06 00:29:32 +01:00
2012-01-12 18:18:23 +01:00
2012-01-12 18:18:23 +01:00
2011-12-31 01:16:45 +01:00
2011-12-31 01:16:45 +01:00
2012-01-29 00:34:59 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2011-12-28 19:05:16 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-02-16 01:34:37 +01:00
2011-12-24 22:03:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-07 01:40:29 +01:00
2012-02-16 01:34:37 +01:00
2012-01-08 03:34:22 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-01-05 22:24:51 +01:00
2011-12-22 19:48:52 -08:00
2012-02-12 01:06:13 +01:00
2012-02-16 01:34:37 +01:00
2012-01-31 02:46:26 +01:00
2012-02-16 04:01:24 +01:00
2012-02-18 02:20:19 +01:00
2012-02-16 01:34:37 +01:00
2012-02-16 01:34:37 +01:00
2012-02-17 00:35:06 +01:00
2011-12-24 12:41:44 +01:00
2011-12-20 04:12:09 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-02-17 20:46:37 +01:00
2012-01-29 00:34:59 +01:00
2012-01-03 03:25:22 +01:00
2012-02-17 22:39:23 +01:00
2012-01-04 19:45:46 +01:00
2012-01-04 19:45:46 +01:00
2012-02-04 01:12:04 +01:00
2012-02-02 02:24:09 +01:00
bbb61a1cd5