diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-27 10:57:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-27 11:35:03 +0200 |
| commit | 3fa6c992d9c332793cb3012bcfe427861441583b (patch) | |
| tree | c0303290c4dcd1c931c1a1c80a2bbe33f748b2de /libavcodec/x86/ac3dsp_init.c | |
| parent | 785eb5fc57e006543254d35f5d699eff57a4f681 (diff) | |
| parent | 7c00e9d8aed8511c44281d7b05562578a3fcd4c8 (diff) | |
| download | ffmpeg-3fa6c992d9c332793cb3012bcfe427861441583b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
Conflicts:
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/ac3dsp_init.c')
| -rw-r--r-- | libavcodec/x86/ac3dsp_init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c index d7c5902ce1..1bc5163316 100644 --- a/libavcodec/x86/ac3dsp_init.c +++ b/libavcodec/x86/ac3dsp_init.c @@ -194,7 +194,6 @@ av_cold void ff_ac3dsp_init_x86(AC3DSPContext *c, int bit_exact) c->ac3_rshift_int32 = ff_ac3_rshift_int32_mmx; } if (EXTERNAL_AMD3DNOW(mm_flags)) { - c->extract_exponents = ff_ac3_extract_exponents_3dnow; if (!bit_exact) { c->float_to_fixed24 = ff_float_to_fixed24_3dnow; } |