1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/tests
Michael Niedermayer 3194ab78a6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avcodec: add a cook parser to get subpacket duration
  FATE: allow lavf tests to alter input parameters
  FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
  FATE: replace the acodec-g726 test with 4 new encode/decode tests
  FATE: replace current g722 encoding tests with an encode/decode test
  FATE: add a pattern rule for generating asynth wav files
  FATE: optionally write a WAVE header in audiogen
  avutil: add audio fifo buffer

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavutil/avutil.h
	tests/Makefile
	tests/codec-regression.sh
	tests/fate/voice.mak
	tests/lavf-regression.sh
	tests/ref/acodec/g722
	tests/ref/acodec/g726
	tests/ref/acodec/pcm_s24daud
	tests/ref/lavf/dv_fmt
	tests/ref/lavf/gxf
	tests/ref/lavf/mxf
	tests/ref/lavf/mxf_d10
	tests/ref/seek/lavf_dv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-20 22:18:26 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
ref Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
asynth1.sw
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
copycooker.sh
fate_config.sh.template
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
lavfi-regression.sh Merge remote-tracking branch 'qatar/master' 2012-04-14 22:37:43 +02:00
lena.pnm
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
md5.sh
regression-funcs.sh Add nellymoser "fuzzy" FATE test. 2012-04-08 02:43:56 +02:00
rotozoom.c tests/rotozoom: make some things const. 2012-03-15 21:52:11 +01:00
tiny_psnr.c tiny_psnr: reindent after last commit. 2012-04-15 15:46:46 +02:00
videogen.c