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
..
2012-11-29 13:24:48 +00:00
2012-11-20 00:26:46 -05:00
2012-10-18 13:12:28 +01:00
2012-11-04 19:11:26 +00:00
2012-12-02 14:44:26 +01:00
2012-12-05 13:01:22 +00:00
2012-11-23 17:30:05 +00:00
2012-12-07 11:34:16 +01:00
2012-12-03 01:34:14 +01:00
2012-11-05 15:32:30 -05:00
2012-10-18 13:12:28 +01:00
2012-11-29 13:24:48 +00:00
2012-10-23 02:19:38 +02:00
2012-10-18 13:12:28 +01:00
2012-12-03 03:15:41 +01:00