FFmpeg/doc
Michael Niedermayer 5f268ca5c5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: pass options from AVFormatContext to avio.
  avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
  avio: add avio_open2, taking an interrupt callback and options
  avio: add support for passing options to protocols.
  avio: add and use ffurl_protocol_next().
  avformat: Pass the interrupt callback on to chained muxers/demuxers
  avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc
  avformat: Use ff_check_interrupt
  avio: Add an internal utility function for checking the new interrupt callback
  avio: Add AVIOInterruptCB
  texi2html: remove stray \n
  doc: prettyfy the texi2html documentation
  swscale: handle unaligned buffers in yuv2plane1

Conflicts:
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-14 00:33:39 +01:00
..
examples Replace remaining av_new_stream() with avformat_new_stream(). 2011-11-05 15:07:19 +01:00
APIchanges Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01: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
developer.texi
encoders.texi doc: fix and clarify libx264 encoding. 2011-10-30 02:08:57 +02:00
eval.texi
faq.texi
fate.txt
ffmpeg-mt-authorship.txt
ffmpeg.texi doc: update examples to use -b:v or -b:a 2011-11-10 23:09:17 +01:00
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffserver.conf
ffserver.texi doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
filters.texi doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
general.texi VBLE Decoder 2011-11-12 01:21:01 +01:00
git-howto.txt Merge remote-tracking branch 'qatar/master' 2011-11-09 02:59:49 +01:00
indevs.texi Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
issue_tracker.txt
libavfilter.texi doc: drop "./" binary prefixes. 2011-11-13 23:35:45 +01:00
Makefile
metadata.texi
multithreading.txt
muxers.texi doc: tiny spelling fix 2011-10-27 00:25:32 +02:00
optimization.txt
outdevs.texi
protocols.texi Merge remote-tracking branch 'qatar/master' 2011-11-10 03:45:23 +01:00
rate_distortion.txt
RELEASE_NOTES
snow.txt
soc.txt
swresample.txt
swscale.txt
t2h.init Merge remote-tracking branch 'qatar/master' 2011-11-14 00:33:39 +01:00
tablegen.txt
texi2pod.pl
viterbi.txt