1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/tests
Michael Niedermayer ad1c8dd673 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: add dxtory test
  adx_parser: rewrite.
  adxdec: Validate channel count to fix a division by zero.
  adxdec: Do not require extradata.
  cmdutils: K&R reformatting cosmetics
  alacdec: implement the 2-pass prediction type.
  alacenc: implement the 2-pass prediction type.
  alacenc: do not generate invalid multi-channel ALAC files
  alacdec: fill in missing or guessed info about the extradata format.
  utvideo: proper median prediction for interlaced videos
  lavu: bump lavu minor for av_popcount64
  dca: K&R formatting cosmetics
  dct: K&R formatting cosmetics
  lavf: flush decoders in avformat_find_stream_info().
  win32: detect number of CPUs using affinity
  Add av_popcount64
  snow: Restore three mistakenly removed casts.

Conflicts:
	cmdutils.c
	doc/APIchanges
	libavcodec/adx_parser.c
	libavcodec/adxdec.c
	libavcodec/alacenc.c
	libavutil/avutil.h
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-04 01:12:34 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +01:00
ref Merge remote-tracking branch 'qatar/master' 2012-01-04 01:12:34 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2012-01-03 03:06:45 +01:00
copycooker.sh
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
fate-run.sh fate: give stderr hint when a test fails. 2011-12-26 22:27:01 +01:00
fate-update.sh
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
lavfi-regression.sh
lena.pnm
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-01 00:07:31 +01:00
md5.sh
regression-funcs.sh Run zmbv regression without md5sum. 2011-12-10 19:34:28 +01:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
tiny_psnr.c
videogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00