ffmpeg/tests
Michael Niedermayer af164d7d9f Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'
* commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152':
  fate: dpcm: Add dependencies
  SBR DSP x86: implement SSE sbr_hf_gen
  AAC SBR: use AVFloatDSPContext's vector_fmul
  fate: image: Add dependencies
  Changelog: add an entry for deprecating the avconv -vol option
  x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32

Conflicts:
	Changelog
	libavutil/x86/float_dsp.asm
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07 15:21:41 +01:00
..
fate Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152' 2012-12-07 15:21:41 +01:00
ref Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652' 2012-12-06 14:33:38 +01:00
Makefile Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' 2012-11-29 14:16:46 +01:00
audiogen.c
base64.c
copycooker.sh
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-12-05 17:33:12 +01:00
fate-update.sh
fate-valgrind.supp
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh IRCAM demuxer & muxer 2012-12-05 13:01:22 +00:00
lavfi-regression.sh fate: add hue filter test. 2012-12-02 14:44:26 +01:00
lena.pnm
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta
tiny_psnr.c
utils.c
videogen.c