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-02-26 07:48:45 +01:00
2011-06-30 09:47:32 +01:00
caf
2012-03-12 17:01:58 +02:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
crc
2011-07-03 17:17:54 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-27 00:00:55 +01:00
2012-03-02 18:58:19 +02:00
2012-03-02 18:58:19 +02:00
2011-07-04 16:26:26 +01:00
2012-02-26 07:48:45 +01:00
md5
2011-07-03 18:19:18 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
sha
2010-08-31 20:07:38 +00:00
2012-02-08 21:51:24 +01:00
smc
2012-02-26 07:48:45 +01:00
2010-12-28 23:52:53 +00:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-08 21:51:24 +01:00
2012-02-26 07:48:45 +01:00
2012-02-26 07:48:45 +01:00
2012-02-08 21:51:24 +01:00
2012-03-03 17:03:26 -05:00
w64
2012-02-26 07:48:45 +01:00
2012-01-08 17:26:24 +01:00
2010-08-28 14:51:51 +00:00
2012-01-08 18:33:59 -08:00