Michael Niedermayer
c980be9e3a
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (21 commits)
CDXL demuxer and decoder
hls: Re-add legacy applehttp name to preserve interface compatibility.
hlsproto: Rename the functions and context
hlsproto: Encourage users to try the hls demuxer instead of the proto
doc: Move the hls protocol section into the right place
libavformat: Rename the applehttp protocol to hls
hls: Rename the functions and context
libavformat: Rename the applehttp demuxer to hls
rtpdec: Support H263 in RFC 2190 format
rv30: check block type validity
ttadec: CRC checking
movenc: Support muxing VC1
avconv: Don't split out inline sequence headers when stream copying VC1
rv34: handle size changes during frame multithreading
rv40: prevent undefined signed overflow in rv40_loop_filter()
rv34: use AVERROR return values in ff_rv34_decode_frame()
rv34: use uint16_t for RV34DecContext.deblock_coefs
librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
movenc: Use defines instead of hardcoded numbers for RTCP types
smjpegdec: implement seeking
...
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/rv30.c
libavcodec/tta.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
libswscale/x86/swscale_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-15 01:52:14 +01:00
2012-02-10 01:20:07 +01:00
2012-02-10 01:20:07 +01:00
2012-02-14 01:53:31 +01:00
2012-02-10 01:20:07 +01:00
2012-02-12 21:42:31 +01:00
2012-02-11 01:22:22 +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-11 01:22:22 +01:00
2012-02-11 01:22:22 +01:00
2012-02-01 04:43:06 +01:00
2012-01-24 02:41:53 +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-09 16:36:02 -08:00
2012-02-02 02:24:09 +01:00
2012-02-14 01:53:31 +01:00
2012-02-14 01:53:31 +01:00
2012-01-29 00:34:59 +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-28 20:14:20 +01:00
2012-01-14 01:17:06 +01:00
2012-02-12 01:06:13 +01:00
2012-02-15 01:52:14 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-11 08:23:42 +01:00
2012-02-08 05:53:35 +01:00
2012-01-30 23:28:26 +01:00
2012-01-30 23:28:36 +01:00
2012-02-02 02:24:09 +01:00
2012-01-29 00:34:59 +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
2012-02-03 03:51:32 +01:00
2012-02-09 19:03:32 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 16:32:55 +01:00
2012-02-13 02:06:44 +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-14 22:32:53 +01:00
2012-02-13 02:06:44 +01:00
2012-01-22 23:40:24 +01:00
2012-01-29 00:34:59 +01:00
2012-02-02 20:44:22 +01:00
2012-01-28 21:59:01 +01:00
2012-02-02 01:12:46 +01:00
2012-02-06 20:59:59 +01:00
2012-02-13 02:06:44 +01:00
2012-01-26 17:05:57 +01:00
2012-01-14 01:15:42 +01:00
2012-01-17 01:37:59 +01:00
2012-02-09 01:27:12 +01:00
2012-02-09 01:27:12 +01:00
2012-02-11 01:22:22 +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-14 01:53:31 +01:00
2012-02-02 02:24:09 +01:00
2012-01-24 21:08:41 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-15 00:41:40 +01:00
2012-02-14 01:53:31 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 14:37:47 -05:00
2012-02-02 18:44:52 +01:00
2012-01-15 01:16:54 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 02:24:09 +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-01-29 00:34:59 +01:00
2012-01-25 06:48:30 +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-26 19:54:38 +01:00
2012-02-12 20:24:29 +01:00
2012-02-11 01:22:22 +01:00
2012-01-30 18:39:08 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 01:22:38 +01:00
2012-02-09 01:27:12 +01:00
2012-01-25 18:55:32 +01:00
2012-01-12 13:54:41 +01:00
2012-01-12 13:54:41 +01:00
2012-01-26 02:23:56 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-01-13 19:51:19 +01:00
2012-01-12 16:32:55 +01: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-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-11 23:57:35 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:26:31 +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-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
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-02-09 23:26:28 +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-15 01:52:14 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-18 22:04:14 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 14:37:47 -05:00
2012-02-09 23:26:28 +01:00
2012-01-29 00:34:59 +01:00
2012-01-26 02:23:56 +01:00
2012-02-03 03:51:32 +01:00
2012-02-03 03:51:32 +01:00
2012-02-11 01:22:22 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-02-12 00:20:56 +01:00
2012-01-31 02:46:26 +01:00
2012-02-02 14:31:17 +01:00
2012-01-28 07:53:34 +01:00
2012-02-05 01:34:59 +01:00
2012-01-21 23:11:27 +01:00
2012-02-09 23:26:28 +01:00
2012-02-11 01:22:22 +01:00
2012-02-10 23:18:52 +01:00
2012-02-09 01:27:12 +01:00
2012-01-12 01:10:32 +01:00
2012-02-10 22:50:16 +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-27 17:19:09 -08:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 01:53:31 +01:00
2012-01-22 16:38:20 +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
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-01-15 22:04:25 +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-02 01:12:46 +01:00
2012-02-10 01:20:07 +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
2012-01-26 22:28:25 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 01:53:31 +01:00
2012-01-28 22:08:20 +01:00
2012-01-29 21:00:19 +01:00
2012-02-03 03:51:32 +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-01-28 22:08:21 +01:00
2012-01-26 02:23:56 +01:00
2012-02-14 19:03:10 +01:00
2012-02-15 01:52:14 +01:00
2012-02-15 01:52:14 +01:00
2012-01-13 01:29:48 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2012-02-15 01:52:14 +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-01 04:43:06 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 04:43:06 +01:00
2012-01-26 20:05:15 +01:00
2012-02-12 01:06:13 +01:00
2012-02-11 01:22:22 +01:00
2012-01-28 01:36:42 +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
2012-01-18 22:04:14 +01:00
2012-02-02 02:24:09 +01:00
2012-01-29 00:34:59 +01:00
2012-02-15 01:52:14 +01:00
2012-01-29 00:34:59 +01:00
2012-02-14 02:26:42 +01:00
2012-02-07 00:46:01 +01:00
2012-02-06 08:00:31 +01:00
2012-02-11 01:22:22 +01:00
2012-01-28 22:08:21 +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
2012-01-29 00:34:59 +01:00
2012-01-12 18:18:23 +01:00
2012-02-11 01:22:22 +01:00
2012-01-27 02:09:58 +01:00
2012-02-02 02:24:09 +01:00
2012-02-15 01:52:14 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-02-03 03:51:32 +01:00
2012-01-25 21:12:00 +01:00
2012-02-08 05:53:35 +01:00
2012-02-07 01:40:29 +01:00
2012-02-12 01:06:13 +01:00
2012-01-29 00:34:59 +01:00
2012-01-31 02:46:26 +01:00
2012-02-01 02:36:09 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-29 00:34:59 +01:00
2012-02-04 01:12:04 +01:00
2012-02-02 02:24:09 +01:00
c980be9e3a