Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 Dec 2011 00:02:37 +0000 (01:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 Dec 2011 00:02:37 +0000 (01:02 +0100)
commit7f92f3d8129f44bc2ed935e9d81735ffdcd9921f
tree1b56b42bedce2ed6b28e629055be671be027e7b5
parentff53c79d0aefcef91e0a57125aeaffa08b326e56
parentadedd840e20cbcf6b23b41d415581dc03bcce4c6
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>
doc/developer.texi
doc/filters.texi
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_refs.c
tests/fate/h264.mak
tests/fate2.mak