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