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
..
acodec	Merge remote-tracking branch 'qatar/master'	2011-12-02 00:51:11 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2011-12-04 01:02:37 +01:00
lavf	movenc: Write file with minimal number of chunks for the given interleaving.	2011-11-29 04:51:47 +01:00
lavfi	swscale: alpha less rgb32 support.	2011-11-28 04:14:22 +01:00
seek	fate: update asf seektest	2011-12-02 16:43:05 +01:00
vsynth1	movenc: Write file with minimal number of chunks for the given interleaving.	2011-11-29 04:51:47 +01:00
vsynth2	movenc: Write file with minimal number of chunks for the given interleaving.	2011-11-29 04:51:47 +01:00