ffmpeg/doc
Michael Niedermayer d0492578c8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  presets: rename presets directory
  lavc: make avcodec_get_context_defaults3 "officially" public
  lavf: replace av_new_stream->avformat_new_stream part II.
  lavf,lavd: replace av_new_stream->avformat_new_stream part I.
  lavf: add avformat_new_stream as a replacement for av_new_stream.
  Use correct scaling table for bwd-pred MVs in second B-field
  Ut Video decoder
  Makefile: change presets extension to .avpreset
  lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
  lavfi: add testsrc source
  AVOptions: add documentation.
  presets: update libx264 ffpresets

Conflicts:
	Changelog
	doc/APIchanges
	doc/ffmpeg.texi
	ffpresets/libx264-ipod320.ffpreset
	ffpresets/libx264-ipod640.ffpreset
	ffserver.c
	libavcodec/avcodec.h
	libavcodec/options.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavfilter/avfilter.h
	libavfilter/vsrc_testsrc.c
	libavformat/flvdec.c
	libavformat/riff.c
	libavformat/version.h
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-20 02:34:51 +02:00
..
examples Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
APIchanges Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
Makefile
RELEASE_NOTES
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-10-19 02:08:59 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi Rename ffplay to avplay. 2011-08-09 19:56:21 +02:00
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 Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +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 Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
filters.texi lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs 2011-10-19 07:09:08 +02:00
general.texi Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
git-howto.txt
indevs.texi lavdev/lavfi: add audio support 2011-09-16 21:22:05 +02:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi Remove reference to the libavfilter soc SVN repo, update libavfilter status description 2011-09-10 23:40:52 +02:00
metadata.texi
multithreading.txt
muxers.texi
optimization.txt
outdevs.texi
protocols.texi Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
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