1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
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
..
asf
2012-04-05 06:03:10 +02:00
au
avi
2012-02-07 20:11:11 +01:00
bmp
dpx
2012-04-06 19:50:37 +02:00
jpg
mov
2012-04-06 19:50:37 +02:00
nut
2012-02-07 20:11:11 +01:00
ogg
2012-02-07 20:11:11 +01:00
pam
2012-03-14 15:34:50 +01:00
pcx
pgm
png
ppm
rm
2012-03-22 00:40:11 +01:00
sgi
2012-03-03 20:57:03 -05:00
swf
tga
ts
2012-03-22 00:40:11 +01:00
wav
xbm
2012-04-09 17:21:35 +02:00