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