1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/tests
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
..
fate Merge remote-tracking branch 'qatar/master' 2011-12-04 01:02:37 +01:00
ref Merge remote-tracking branch 'qatar/master' 2011-12-04 01:02:37 +01:00
audiogen.c
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
copycooker.sh
fate2.mak Merge remote-tracking branch 'qatar/master' 2011-12-04 01:02:37 +01:00
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
fate-update.sh
fate.mak Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2011-11-19 02:00:06 +01:00
lavfi-regression.sh
lena.pnm
Makefile fate: add --timeout=60 --contimeout=60 to fate-rsync 2011-11-07 15:13:16 +01:00
md5.sh
regression-funcs.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
rotozoom.c
tiny_psnr.c
videogen.c