ffmpeg/tests/ref
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
..
acodec Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
fate Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
lavf-fate latmenc: copy pce config from proper location. 2012-04-12 20:28:37 +02:00
lavfi vf_thumbnail: colorspace changed from yv12 to rgb 2012-04-17 04:06:27 +02:00
seek Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
vsynth1 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
vsynth2 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00