ffmpeg/doc
Michael Niedermayer 7f92f3d812 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: fix frame reordering code.
  fate: Add a test for the VBLE decoder
  doc: break some long lines in developer.texi
  drawtext: make x and y parametric
  drawtext: manage memory allocation better
  drawtext: refactor draw_text
  doc: remove space between variable and post increment in example code

Conflicts:
	doc/developer.texi
	doc/filters.texi
	libavcodec/h264.c
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-04 01:02:37 +01:00
..
examples
APIchanges
Makefile
RELEASE_NOTES
avconv.texi
avtools-common-opts.texi
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi Merge remote-tracking branch 'qatar/master' 2011-12-04 01:02:37 +01:00
encoders.texi
eval.texi
faq.texi
fate.txt
ffmpeg-mt-authorship.txt
ffmpeg.texi
ffmpeg.txt
ffplay.texi
ffprobe.texi
ffserver.conf
ffserver.texi
filters.texi Merge remote-tracking branch 'qatar/master' 2011-12-04 01:02:37 +01:00
general.texi
git-howto.txt
indevs.texi
issue_tracker.txt
libavfilter.texi
metadata.texi
multithreading.txt
muxers.texi
optimization.txt
outdevs.texi
protocols.texi
rate_distortion.txt
snow.txt
soc.txt
swresample.txt
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt