ffmpeg/doc
Michael Niedermayer fa3fde168b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libvpxenc: use the default bitrate if not set
  utvideo: Rename utvideo.c to utvideodec.c
  doc: Fix syntax errors in sample Emacs config
  mjpegdec: more meaningful return values
  configure: clean up Altivec detection
  getopt: Remove an unnecessary define
  rtmp: Use int instead of ssize_t
  getopt: Add missing includes
  rtmp: Add support for receiving incoming streams
  Add missing includes for code relying on external libraries

Conflicts:
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/mjpegdec.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-17 17:06:52 +02:00
..
doxy
examples Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
APIchanges Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
Makefile build: extend documentation building mechanism 2012-08-13 12:22:02 +02:00
RELEASE_NOTES
avtools-common-opts.texi doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section 2012-07-20 12:56:28 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi lavf/img2dec: add and document pattern_type option 2012-08-08 23:43:36 +02:00
developer.texi Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
encoders.texi
errno.txt
eval.texi
faq.texi faq: suggest the concat filter. 2012-07-28 18:16:55 +02:00
fate.texi
ffmpeg.texi ffmpeg: add an option to fix subtitles durations. 2012-08-14 11:17:45 +02:00
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffprobe.xsd ffprobe: fix validity error with tags and data. 2012-07-31 15:06:57 +02:00
ffserver.conf
ffserver.texi
filter_design.txt filter_design: document ownership and permissions. 2012-08-14 12:12:20 +02:00
filters.texi lavfi: add edgedetect filter. 2012-08-16 22:03:32 +02:00
general.texi Add ICO muxer 2012-08-14 16:54:25 +02:00
git-howto.texi Merge remote-tracking branch 'qatar/master' 2012-07-24 21:15:57 +02:00
git-howto.txt
indevs.texi doc/indevs: document missing options in x11grab section 2012-08-08 23:43:37 +02:00
issue_tracker.txt
metadata.texi
mips.txt
multithreading.txt
muxers.texi Add ICO muxer 2012-08-14 16:54:25 +02:00
optimization.txt
outdevs.texi lavd/caca: rename "colors" option to "color" 2012-07-22 10:31:33 +02:00
platform.texi Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00
print_options.c
protocols.texi Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt
syntax.texi
t2h.init doc: declare encoding for texi2html. 2012-07-22 12:48:57 +02:00
tablegen.txt
texi2pod.pl doc/texi2pod: add "use warnings" directive 2012-08-12 23:52:55 +02:00
viterbi.txt