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
..
doxy	doxygen: cleanup style to support older doxy	2011-12-29 17:19:46 +01:00
examples	Merge remote-tracking branch 'qatar/master'	2012-02-25 04:00:43 +01:00
APIchanges	Merge remote-tracking branch 'qatar/master'	2012-03-18 23:39:42 +01:00
avtools-common-opts.texi	docs: Add examples for -cpuflags	2012-03-14 23:06:00 +01:00
avutil.txt
bitstream_filters.texi	Merge remote-tracking branch 'qatar/master'	2012-02-25 04:00:43 +01:00
build_system.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00
decoders.texi
demuxers.texi
developer.texi
encoders.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
errno.txt
eval.texi	eval: add root() to solve f(x)=0	2012-02-27 00:00:55 +01:00
faq.texi	faq: fix typo.	2012-01-24 16:03:09 +01:00
fate.texi	Merge remote-tracking branch 'qatar/master'	2012-03-07 03:22:49 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi	doc/ffmpeg.texi: apply misc fixes to the -map_channel documentation	2012-03-08 13:30:01 +01:00
ffmpeg.txt	Fix "ouput" typo and add a check.	2012-01-28 11:04:19 +01:00
ffplay.texi
ffprobe.texi	ffprobe: add count_frames and count_packets options	2012-02-17 01:06:43 +01:00
ffprobe.xsd	ffprobe: report bit rate in stream description	2012-02-20 17:46:26 +01:00
ffserver.conf	Merge remote-tracking branch 'qatar/master'	2012-02-10 01:20:07 +01:00
ffserver.texi
filters.texi	lavfi/movie: add loop parameter	2012-03-18 21:19:09 +01:00
general.texi	Merge remote-tracking branch 'qatar/master'	2012-03-20 00:03:19 +01:00
git-howto.texi
git-howto.txt
indevs.texi	Merge remote-tracking branch 'qatar/master'	2012-03-08 02:51:45 +01:00
issue_tracker.txt
libavfilter.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
Makefile
metadata.texi
multithreading.txt
muxers.texi	Merge remote-tracking branch 'qatar/master'	2012-03-01 03:17:11 +01:00
optimization.txt
outdevs.texi	doc: use @command{} for commands.	2012-01-04 13:21:08 +01:00
platform.texi	Fix a bunch of platform name and other typos.	2012-01-11 13:48:30 +01:00
protocols.texi	bluray protocol	2012-03-03 04:30:49 +01:00
rate_distortion.txt
RELEASE_NOTES	RELEASE_NOTES: update for 0.10	2012-01-26 21:59:09 +01:00
snow.txt
soc.txt
swresample.txt	cosmetics: fix some typos	2012-03-13 01:14:04 +01:00
swscale.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt	cosmetics: Delete empty lines at end of file.	2012-02-09 12:26:45 +01:00