Michael Niedermayer
3602ad7ee6
Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'
...
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf':
swscale: fix crash with dithering due incorrect offset calculation.
matroskadec: fix stupid typo (!= -> ==)
build: remove duplicates from order-only directory prerequisite list
build: rework rules for things in the tools dir
configure: fix --cpu=host with gcc 4.6
ARM: use const macro to define constant data in asm
bitdepth: simplify FUNC/FUNCC macros
dsputil: remove ff_emulated_edge_mc macro used in one place
9/10-bit: simplify clipping macros
matroskadec: reindent
matroskadec: defer parsing of cues element until we seek.
lavc: add support for codec-specific defaults.
lavc: make avcodec_alloc_context3 officially public.
lavc: remove a half-working attempt at different defaults for audio/video codecs.
ac3dec: add a drc_scale private option
lavf: add avformat_find_stream_info()
lavc: introduce avcodec_open2() as a replacement for avcodec_open().
Conflicts:
Makefile
libavcodec/utils.c
libavformat/avformat.h
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-11 04:23:25 +02:00
..
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-06-11 03:51:36 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-08 01:05:28 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-13 19:02:50 +02:00
2011-07-04 00:45:21 +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-06-03 05:19:30 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +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-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-06-09 04:47:19 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-07-04 00:45:21 +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-07-11 04:23:25 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-06-09 04:47:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-01 20:29:27 +02:00
2011-07-03 03:14:10 +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-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-06 23:57:11 +02:00
2011-03-19 13:33:20 +00:00
2011-07-09 17:13:13 +02:00
2011-04-28 10:45:32 +02:00
2011-07-04 00:45:21 +02:00
2011-07-09 17:13:13 +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-06-09 02:43:55 +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-07-04 00:45:21 +02:00
2011-05-02 18:38:01 +02:00
2011-07-04 00:45:21 +02: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-07-06 23:57:11 +02:00
2011-07-06 23:57:11 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-06-09 04:47:19 +02: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-06-09 04:47:19 +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-07-06 01:34:08 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-09 02:06:40 +02:00
2011-04-21 03:37:05 +02:00
2011-07-10 04:28:50 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +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-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-04-17 23:43:54 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-07-09 02:06:40 +02:00
2011-06-05 03:00:31 +02:00
2011-07-04 00:45:21 +02:00
2011-06-03 05:19:30 +02:00
2011-06-22 05:16:40 +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-01-30 03:40:58 +01:00
2011-03-19 13:33:20 +00:00
2011-07-06 01:34:08 +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-07-11 04:23:25 +02:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-07-11 04:23:25 +02:00
2011-07-09 02:06:40 +02:00
2011-03-19 13:33:20 +00:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-07-04 00:45:21 +02:00
2011-06-03 05:19:30 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-17 03:05:36 +02:00
2011-07-04 00:45:21 +02:00
2011-07-11 04:23:25 +02:00
2011-06-11 03:51:36 +02:00
2011-07-11 04:23:25 +02:00
2011-07-04 00:45:21 +02:00
2011-07-09 02:06:40 +02:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-06-11 03:51:36 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-06 01:34:08 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +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-07-04 00:45:21 +02:00
2011-07-05 17:22:51 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-05 03:00:31 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-07-05 02:26:17 +02:00
2011-06-09 04:47:19 +02:00
2011-07-04 00:45:21 +02:00
2011-05-30 00:24:01 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-02 20:06:00 +01: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-06-08 07:43:45 +02:00
2011-07-04 00:45:21 +02:00
2011-06-18 05:10:38 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-04 00:45:21 +02: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-07-04 00:45: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-07-04 00:45:21 +02:00
2011-06-06 03:33:58 +02:00
2011-06-05 03:00:31 +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-06-18 05:10:38 +02:00
2011-03-19 13:33:20 +00:00
2011-07-06 10:05:08 +02:00
2011-04-15 04:50:06 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47: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-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +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-06-18 05:10:38 +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-06-03 05:19:30 +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-07-04 00:45:21 +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-06-18 05:10:38 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +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-07-04 00:45:21 +02:00
2011-06-11 03:51:36 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-06-11 03:51:36 +02:00
2011-06-18 05:10:38 +02:00
2011-04-20 04:48:23 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-06-11 03:51:36 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-10 04:28:50 +02:00
2011-04-02 01:54:27 +02:00
2011-03-19 13:33:20 +00:00
2011-06-02 20:06:00 +01:00
2011-06-03 05:19:30 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +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-07-04 00:45:21 +02:00
2011-04-24 17:46:50 +02:00
2011-05-30 02:39:26 +02:00
2011-07-04 00:45:21 +02: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-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-07-01 05:35:26 +02:00
2011-05-22 04:53:19 +02:00
2011-07-11 04:23:25 +02:00
2011-03-19 13:33:20 +00:00
2011-04-04 02:15:12 +02:00
2011-07-09 02:06:40 +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-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-07-03 18:30:02 +02:00
2011-05-01 21:13:18 +02:00
2011-07-04 00:45:21 +02:00
2011-06-29 05:23: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-06-02 20:06:00 +01:00