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
..
2011-12-03 15:18:58 +01:00
2011-11-29 18:25:43 +01:00
2011-09-27 22:00:20 +02:00
2011-11-16 18:40:03 +01:00
2011-08-09 19:56:25 +02:00
2011-11-13 23:35:45 +01:00
2011-10-27 00:25:32 +02:00