Michael Niedermayer
b8a43bc1b5
Merge remote-tracking branch 'qatar/master' into master ...
* qatar/master: (27 commits)
ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
ac3dsp: fix loop condition in ac3_update_bap_counts_c()
ARM: unbreak build
ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
ac3enc: split mantissa bit counting into a separate function.
ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
get_bits: add av_unused tag to cache variable
sws: replace all long with int.
ARM: aacdec: fix constraints on inline asm
ARM: remove unnecessary volatile from inline asm
ARM: add "cc" clobbers to inline asm where needed
ARM: improve FASTDIV asm
ac3enc: use LOCAL_ALIGNED macro
APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
lavu: add av_get_pix_fmt_name() convenience function
cmdutils: remove OPT_FUNC2
swscale: fix crash in bilinear scaling.
vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
webm: support stereo videos in matroska/webm muxer
...
Conflicts:
Changelog
cmdutils.c
cmdutils.h
doc/APIchanges
doc/muxers.texi
ffmpeg.c
ffplay.c
libavcodec/ac3enc.c
libavcodec/ac3enc_float.c
libavcodec/avcodec.h
libavcodec/get_bits.h
libavcodec/libvpxenc.c
libavcodec/version.h
libavdevice/libdc1394.c
libavformat/matroskaenc.c
libavutil/avutil.h
libswscale/rgb2rgb.c
libswscale/swscale.c
libswscale/swscale_template.c
libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-29 03:34:35 +02:00
2011-05-11 05:47:02 +02:00
2011-05-29 03:34:35 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-20 05:48:22 +02:00
2011-05-11 05:47:02 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-29 03:34:35 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-17 00:58:33 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-16 05:01:40 +02:00
2011-05-12 04:51:24 +02:00
2011-05-25 09:49:18 +02:00
2011-04-28 04:26:01 +02:00
2011-05-09 04:50:56 +02:00
2011-04-27 03:51:04 +02:00
2011-04-24 03:41:22 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-07 12:03:59 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-05-19 06:00:31 +02:00
2011-05-25 06:32:45 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-05-25 06:32:45 +02:00
2011-05-29 03:34:35 +02:00
2011-05-27 16:25:22 -04:00
2011-05-29 03:34:35 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-05-16 05:01:40 +02:00
2011-05-08 13:21:51 +02:00
2011-05-21 01:11:42 +02:00
2011-05-29 03:34:35 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-05 03:30:24 +02:00
2011-05-02 16:41:41 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-05-07 12:03:59 +02:00
2011-05-28 18:25:40 +02:00
2011-05-21 02:31:27 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-27 02:53:21 +02:00
2011-04-27 03:51:04 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-04-29 01:29:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-04-27 03:51:04 +02:00
2011-05-20 05:48:22 +02:00
2011-04-30 09:47:28 -07:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-19 06:00:31 +02:00
2011-04-26 22:06:13 +02:00
2011-04-26 22:06:13 +02:00
2011-05-17 13:57:23 +01:00
2011-05-17 13:57:23 +01:00
2011-05-18 05:42:42 +02:00
2011-05-17 13:57:23 +01:00
2011-05-02 02:58:09 +02:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-15 13:12:47 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-12 13:08:10 +02:00
2011-05-12 13:08:10 +02:00
2011-05-01 19:35:55 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-11 14:16:10 +02:00
2011-05-11 05:47:02 +02:00
2011-05-25 06:32:45 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-04 23:33:59 +02:00
2011-05-24 19:10:28 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-12 03:03:08 +02:00
2011-05-07 12:03:59 +02:00
2011-04-27 03:51:04 +02:00
2011-04-27 03:51:04 +02:00
2011-05-26 01:55:12 +02:00
2011-04-29 10:42:43 +02:00
2011-05-12 04:51:24 +02:00
2011-04-29 18:31:17 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-22 04:53:19 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-19 06:00:31 +02:00
2011-05-19 06:00:31 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-19 13:00:31 +02:00
2011-05-28 17:04:47 +01:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-04-25 00:20:03 +02:00
2011-05-02 16:41:41 +02:00
2011-04-25 00:20:03 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-26 03:28:22 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-02 16:41:41 +02:00
2011-05-11 05:47:02 +02:00
2011-05-02 16:41:41 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-24 04:35:08 +02:00
2011-05-11 05:47:02 +02:00
2011-05-02 16:41:41 +02:00
2011-05-11 14:16:10 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 15:35:06 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 17:22:41 +02:00
2011-05-11 05:47:02 +02:00
2011-05-10 07:24:36 -04:00
2011-05-11 06:59:16 -04:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-11 00:01:05 +02:00
2011-05-18 05:42:42 +02:00
2011-04-27 03:51:04 +02:00
2011-05-28 18:25:40 +02:00
2011-05-07 12:03:59 +02:00
2011-05-25 11:29:47 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:54 +02:00
2011-05-24 01:31:54 +02:00
2011-05-24 01:31:54 +02:00
2011-05-24 01:31:53 +02:00
2011-05-12 11:56:53 +02:00
2011-05-12 11:56:53 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-04-23 10:10:20 +02:00
2011-05-20 15:28:29 -04:00
2011-05-08 00:02:47 +02:00
2011-05-10 20:22:06 +02:00
2011-05-28 12:15:59 +02:00
2011-05-27 04:37:33 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-13 04:40:40 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-11 05:47:02 +02:00
2011-05-11 05:47:02 +02:00
2011-05-29 03:34:35 +02:00
2011-05-17 04:51:33 +02:00
2011-05-19 06:00:31 +02:00
2011-05-02 16:41:41 +02:00
2011-04-26 22:06:13 +02:00
2011-05-11 12:26:25 +02:00
2011-04-26 22:06:13 +02:00
2011-04-28 20:39:49 +02:00
2011-05-13 00:22:05 +02:00
2011-05-23 01:23:33 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-10 20:38:07 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-05-20 05:48:22 +02:00
2011-05-20 05:48:22 +02:00
2011-05-20 05:48:22 +02:00
2011-05-20 05:48:22 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-02 16:41:41 +02:00
2011-05-09 17:51:04 +02:00
2011-05-19 06:00:31 +02:00
2011-05-02 16:41:41 +02:00
2011-05-21 05:32:03 +02:00
2011-05-18 05:42:42 +02:00
2011-05-22 04:53:19 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-05-20 05:48:22 +02:00
2011-05-22 04:53:19 +02:00
2011-05-21 05:32:03 +02:00
2011-05-21 05:32:03 +02:00
2011-05-20 05:48:22 +02:00
2011-05-19 12:25:34 +01:00
2011-05-19 12:25:34 +01:00
2011-05-23 17:33:03 +02:00
2011-05-20 05:48:22 +02:00
2011-05-21 13:48:10 +02:00
2011-05-20 05:48:22 +02:00
2011-05-02 16:41:41 +02:00
2011-05-26 03:28:22 +02:00
2011-04-29 17:27:01 +02:00
2011-05-02 16:41:41 +02:00
2011-05-26 03:28:22 +02:00
2011-05-26 03:28:22 +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-22 04:53:19 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-05-15 03:25:57 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 09:40:45 +02:00
2011-05-02 16:41:41 +02:00
2011-05-21 13:48:10 +02:00
2011-04-26 18:25:24 +02:00
2011-04-27 03:51:04 +02:00
2011-05-02 16:41:41 +02:00
2011-05-21 13:48:10 +02:00
2011-05-27 04:36:37 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-24 19:10:34 +02:00
2011-05-07 12:03:59 +02:00
2011-04-27 20:08:09 +02:00
2011-05-16 16:34:47 +02:00
2011-05-02 16:41:41 +02:00
2011-05-08 01:33:40 +02:00
2011-05-08 20:04:57 +02:00
2011-05-02 16:41:41 +02:00
2011-05-09 04:50:56 +02:00
2011-05-09 04:50:56 +02:00
2011-04-27 03:51:04 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-20 05:48:22 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-12 00:19:32 +02:00
2011-05-02 16:41:41 +02:00
2011-05-11 05:47:02 +02:00
2011-05-02 16:41:41 +02:00
2011-05-25 00:13:09 +02:00
2011-05-26 23:49:17 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-23 17:22:02 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-10 07:24:36 -04:00
2011-05-02 16:41:41 +02:00
2011-05-13 00:23:00 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-04 23:33:59 +02:00
2011-04-29 22:46:13 +02:00
2011-05-12 18:02:28 +02:00
2011-05-02 16:41:41 +02:00
2011-05-08 01:33:40 +02:00
2011-05-02 16:41:41 +02:00
2011-05-22 04:53:19 +02:00
2011-05-20 05:48:22 +02:00
2011-04-27 21:49:45 +02:00
2011-05-22 04:53:19 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-25 06:32:45 +02:00
2011-05-11 00:03:11 +02:00
2011-05-13 16:34:23 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-03 01:09:30 +02:00
2011-04-24 03:41:22 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-25 23:42:56 +02:00
2011-05-08 19:53:39 +02:00
2011-05-08 19:53:39 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-05 03:30:24 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
2011-05-28 18:25:40 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-05-19 06:00:31 +02:00
2011-05-13 04:40:40 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-02 16:41:41 +02:00
2011-05-14 02:19:58 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-04-27 03:51:04 +02:00
2011-05-22 02:33:03 +02:00
2011-05-12 18:02:28 +02:00
2011-04-27 03:51:04 +02:00
2011-05-07 04:14:09 +02:00
2011-05-03 04:38:22 +02:00
2011-05-02 16:41:41 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 18:57:51 +02:00
2011-05-04 23:33:59 +02:00
2011-05-22 04:53:19 +02:00
2011-05-07 12:03:59 +02:00
2011-05-07 12:03:59 +02:00
2011-05-02 16:41:41 +02:00
b8a43bc1b5