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>

diff --cc libavcodec/aacsbr.c
Simple merge

diff --cc libavutil/x86/float_dsp.asm
Simple merge

diff --cc tests/fate/image.mak
index 8770c74e1b39992b0094de27f2d571ebbc572204,1e4bc5640710957df47d7b6d75128a8bd21d94f5..abafd5f90798fc4dd1be66819c1c17e362e47e59
--- 1/tests/fate/image.mak
--- 2/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@@ -1,10 -1,10 +1,10 @@@
- FATE_IMAGE += fate-dpx
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
++FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
  fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
  
- FATE_IMAGE += fate-pictor
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
++FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
  fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
  
- FATE_IMAGE += fate-ptx
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
++FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
  fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
  
  FATE_SUNRASTER += fate-sunraster-1bit-raw
@@@ -28,8 -28,10 +28,10 @@@ fate-sunraster-24bit-raw: CMD = framecr
  FATE_SUNRASTER += fate-sunraster-24bit-rle
  fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun
  
- FATE_IMAGE += $(FATE_SUNRASTER)
- fate-sunraster: $(FATE_SUNRASTER)
+ FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER)
+ 
 -FATE_SAMPLES_AVCONV += $(FATE_SUNRASTER-yes)
++FATE_IMAGE += $(FATE_SUNRASTER-yes)
+ fate-sunraster: $(FATE_SUNRASTER-yes)
  
  FATE_TARGA = CBW8       \
               CCM8       \
@@@ -45,8 -47,10 +47,10 @@@
  FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%)  \
                fate-targa-top-to-bottom
  
- FATE_IMAGE += $(FATE_TARGA)
- fate-targa: $(FATE_TARGA)
+ FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA)
+ 
 -FATE_SAMPLES_AVCONV += $(FATE_TARGA-yes)
++FATE_IMAGE += $(FATE_TARGA-yes)
+ fate-targa: $(FATE_TARGA-yes)
  
  fate-targa-conformance-CBW8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA
  fate-targa-conformance-CCM8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA  -pix_fmt rgba
@@@ -67,12 -71,7 +71,15 @@@ fate-tiff-fax-g3: CMD = framecrc -i $(S
  FATE_TIFF += fate-tiff-fax-g3s
  fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
  
- FATE_IMAGE += $(FATE_TIFF)
- fate-tiff: $(FATE_TIFF)
+ FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF)
+ 
 -FATE_SAMPLES_AVCONV += $(FATE_TIFF-yes)
++FATE_IMAGE += $(FATE_TIFF-yes)
+ fate-tiff: $(FATE_TIFF-yes)
 +
 +FATE_IMAGE += fate-xface
 +fate-xface: CMD = framecrc -i $(SAMPLES)/xface/lena.xface
 +
++FATE_IMAGE += $(FATE_IMAGE-yes)
++
 +FATE_SAMPLES_FFMPEG += $(FATE_IMAGE)
 +fate-image: $(FATE_IMAGE)
-