1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
FFmpeg/tests
Michael Niedermayer bae053fca4 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: make compare() function compatible with POSIX bc
  Update Janne's email address.
  APIchanges: Replace Subversion revision numbers by Git hashes.
  bytestream: Eliminate one level of pointless macro indirection.
  xwd: convert to bytestream2.
  vqavideo: port to bytestream2 API
  Read preset files with suffix .avpreset
  prores: allow user to set fixed quantiser
  lavf: remove some disabled code.
  lavf: only set average frame rate for video.
  lavf: remove a pointless check.
  avcodec: add XBM encoder

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vqavideo.c
	libavformat/img2enc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-18 23:39:42 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-03-17 23:16:05 +01:00
ref Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
asynth1.sw movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
base64.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2012-03-17 23:16:05 +01:00
copycooker.sh
fate_config.sh.template
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
fate-update.sh
fate-valgrind.supp Add a --valgrind configure option. 2012-01-21 12:04:46 +01:00
fate.sh fate: add support for specifying the shell used to run configure 2012-01-30 20:35:09 +01:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
lavfi-regression.sh fate: disable deshake test as it isnt binary identical across archs. 2012-02-29 07:03:04 +01:00
lena.pnm
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-17 04:43:12 +01:00
md5.sh
regression-funcs.sh Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
rotozoom.c tests/rotozoom: make some things const. 2012-03-15 21:52:11 +01:00
tiny_psnr.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
videogen.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00