ffmpeg/libavcodec
Michael Niedermayer 479fb7b8af Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits)
  fix space type in Changelog
  ZeroCodec Decoder
  RealAudio Lossless decoder
  rtpenc: Use AVFormatContext.packet_size instead of a private option
  url: Document the expected behaviour of url_read
  libavformat: Use AVFormatContext.probesize in init_input
  docs: Fix a stray reference to tags in the generic doxy on dicts
  cosmetics: Align some AVInput/OutputFormat declarations
  zmbv: check decompress result
  zmbv: correct indentation
  adpcm: convert adpcm_thp to bytestream2.
  adpcm: convert adpcm_yamaha to bytestream2.
  adpcm: convert adpcm_swf to bytestream2.
  adpcm: convert adpcm_sbpro to bytestream2.
  adpcm: convert adpcm_ct to bytestream2.
  adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
  adpcm: convert adpcm_ea_xas to bytestream2.
  adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
  adpcm: convert ea_maxis_xa to bytestream2.
  adpcm: convert adpcm_ea to bytestream2.
  ...

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/adpcm.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavcodec/zmbv.c
	libavformat/riff.c
	libavformat/url.h
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-20 00:03:19 +01:00
..
2012-03-15 22:07:54 +01:00
2012-03-07 12:16:36 -08:00
2011-11-25 13:19:54 +00:00
2012-02-20 15:08:41 -05:00
2012-01-14 01:17:06 +01:00
2011-09-16 05:53:14 +02:00
2012-01-14 04:47:27 +01:00
2011-11-12 20:01:50 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-01-14 01:15:42 +01:00
2012-03-18 02:57:25 +01:00
2011-12-10 11:58:03 +01:00
2012-03-13 01:14:04 +01:00
2012-03-13 22:05:22 +01:00
2012-03-07 05:11:40 +01:00
2012-02-24 03:30:42 +01:00
2012-03-02 18:58:19 +02:00
2012-03-02 18:58:19 +02:00
2011-10-10 02:58:18 +02:00
2011-09-24 21:11:01 +02:00
2011-09-25 21:16:55 +02:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2012-03-15 22:17:36 +01:00
2012-03-18 14:07:32 +01:00
2012-02-24 04:12:40 +01:00
2012-02-14 01:22:38 +01:00
2011-09-08 05:34:17 +02:00
2012-03-03 04:14:37 +01:00
2012-01-07 00:11:43 +01:00
2012-03-18 14:06:59 +01:00
2012-03-13 22:38:45 +01:00
2011-12-17 05:04:56 +01:00
2012-03-13 01:14:04 +01:00
2012-02-24 04:13:01 +01:00
2011-11-11 18:40:19 +01:00
2012-03-19 18:46:34 +01:00
2012-03-19 18:46:34 +01:00
2012-02-14 19:03:10 +01:00
2011-12-13 21:08:43 +01:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-02-16 06:25:32 +01:00
2012-03-19 22:37:06 +01:00
2012-03-16 15:11:18 +01:00
2012-03-09 09:17:07 +01:00
2011-10-19 20:26:55 +02:00
2012-02-23 23:38:20 +01:00
2012-02-23 23:42:04 +01:00
2012-03-13 01:14:04 +01: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
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-03-17 15:45:04 -04:00
2012-01-23 19:04:35 +01:00
2012-03-18 07:45:41 -07:00
2012-02-25 07:45:06 +01:00
2011-11-12 20:49:53 +01:00
2012-02-23 23:40:51 +01:00