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
APIchanges
Makefile
RELEASE_NOTES
avtools-common-opts.texi
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi Merge remote-tracking branch 'qatar/master' 2012-08-17 17:06:52 +02:00
encoders.texi
errno.txt
eval.texi
faq.texi
fate.texi
ffmpeg.texi
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffprobe.xsd
ffserver.conf
ffserver.texi
filter_design.txt
filters.texi
general.texi
git-howto.texi
git-howto.txt
indevs.texi
issue_tracker.txt
metadata.texi
mips.txt
multithreading.txt
muxers.texi
optimization.txt
outdevs.texi
platform.texi
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
tablegen.txt
texi2pod.pl
viterbi.txt