• Michael Niedermayer's avatar
    Merge commit 'c25fc5c2' · af164d7d
    Michael Niedermayer authored
    * commit 'c25fc5c2':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    af164d7d
aacsbr.c 63.5 KB