ffmpeg/doc
Michael Niedermayer 8bc7fe4daf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 00:39:48 +01:00
..
examples Merge remote-tracking branch 'qatar/master' 2011-12-09 00:05:51 +01:00
APIchanges Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
avtools-common-opts.texi Fix a bunch of common typos. 2011-12-11 00:32:25 +01:00
avutil.txt
bitstream_filters.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
build_system.txt
decoders.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
demuxers.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
developer.texi Fix a bunch of common typos. 2011-12-11 00:32:25 +01:00
encoders.texi doc: fix and clarify libx264 encoding. 2011-10-30 02:08:57 +02:00
eval.texi Fix a bunch of common typos. 2011-12-11 00:32:25 +01:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
fate.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
fate.txt doc: document fate in a texinfo 2011-12-09 18:26:17 +01:00
ffmpeg-mt-authorship.txt
ffmpeg.texi doc/ffmpeg.texi 2011-12-11 18:50:39 +01: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: add csv writer 2011-11-16 18:40:03 +01:00
ffserver.conf
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
filters.texi drawtext: allow burning the timecode. 2011-12-12 17:49:34 +01:00
general.texi Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
git-howto.txt githowto: git is generally available as package in most distros. 2011-11-23 23:03:37 +01:00
indevs.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
issue_tracker.txt
libavfilter.texi doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
Makefile doc: split platform specific information 2011-12-09 18:26:31 +01:00
metadata.texi
multithreading.txt
muxers.texi Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
optimization.txt
outdevs.texi docs: Spelling fixes to 9 texi files from /doc 2011-11-29 18:26:06 +01:00
platform.texi Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS X 2011-12-11 03:00:30 +01:00
protocols.texi Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
rate_distortion.txt
RELEASE_NOTES
snow.txt
soc.txt Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
swresample.txt swr-docs: update due to last change to swresample 2011-10-06 00:32:01 +02:00
swscale.txt
t2h.init Merge remote-tracking branch 'qatar/master' 2011-12-10 02:01:03 +01:00
tablegen.txt
texi2pod.pl
viterbi.txt