ffmpeg/doc
Michael Niedermayer 91eb1b1525 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  prores: add FATE tests
  id3v2: reduce the scope of some non-globally-used symbols/structures
  id3v2: cosmetics: move some declarations before the places they are used
  shorten: remove the flush function.
  shn: do not allow seeking in the raw shn demuxer.
  avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK.
  avformat: update AVInputFormat allowed flags
  avformat: don't unconditionally call ff_read_frame_flush() when trying to seek.
  truespeech: use sizeof() instead of hardcoded sizes
  truespeech: remove unneeded variable, 'consumed'
  truespeech: simplify truespeech_read_frame() by using get_bits()
  truespeech: decode directly to output buffer instead of a temp buffer
  truespeech: check to make sure channels == 1
  truespeech: check for large enough output buffer rather than truncating output
  truespeech: remove unneeded zero-size packet check.
  mlpdec: return meaningful error codes instead of -1
  mlpdec: remove unnecessary wrapper function
  mlpdec: only calculate output size once
  mlpdec: validate that the reported channel count matches the actual output channel count
  pcm: reduce pointer type casting
  ...

Conflicts:
	libavformat/avformat.h
	libavformat/id3v2.c
	libavformat/id3v2.h
	libavformat/utils.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-14 03:48:22 +02:00
..
examples examples/encoding: rename to decoding_encoding.c as the file is an example for both. 2011-10-11 22:16:04 +02:00
APIchanges Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
Makefile
RELEASE_NOTES
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
encoders.texi Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
eval.texi eval: add mathematical constants (PI, E, PHI). 2011-10-13 16:50:20 +02:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
fate.txt
ffmpeg-mt-authorship.txt
ffmpeg.texi doc: fix references to obsolete presets directories for avconv/ffmpeg 2011-10-11 14:31:19 +02:00
ffmpeg.txt doc: small ascii diagram on I/O files and streams in ffmpeg.c 2011-10-12 15:43:52 +02:00
ffplay.texi ffplay.texi: document -codec 2011-09-27 22:00:20 +02:00
ffprobe.texi ffprobe: parse arguments for -print_format writer 2011-10-09 16:03:13 +02:00
ffserver.conf
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
filters.texi vsrc_nullsrc: remove mathematical constants now redundant. 2011-10-13 18:08:51 +02:00
general.texi Add G.723.1 to the documentation. 2011-10-10 10:49:16 +02:00
git-howto.txt
indevs.texi lavdev/lavfi: add audio support 2011-09-16 21:22:05 +02:00
issue_tracker.txt
libavfilter.texi
metadata.texi
multithreading.txt
muxers.texi
optimization.txt
outdevs.texi
protocols.texi
rate_distortion.txt
snow.txt
soc.txt
swresample.txt swr-docs: update due to last change to swresample 2011-10-06 00:32:01 +02:00
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt