diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:21:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:21:41 +0100 |
| commit | af164d7d9f12f9c2a4b284957eb92ad74cd49b3d (patch) | |
| tree | 942f8ceec8738f4436612742a0d08c180c67193d /libavcodec/xbmenc.c | |
| parent | 8ca8b43d7108b9d7e6887fd553d13a71afa670c6 (diff) | |
| parent | c25fc5c2bb6ae8c93541c9427df3e47206d95152 (diff) | |
| download | ffmpeg-af164d7d9f12f9c2a4b284957eb92ad74cd49b3d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/xbmenc.c')
0 files changed, 0 insertions, 0 deletions