diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-08 02:59:58 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-17 09:07:10 -0700 |
| commit | 2d60444331fca1910510038dd3817bea885c2367 (patch) | |
| tree | 51ac937c7e051b03c7cc8e39b079a37f18dd09b0 /libavcodec/ac3enc.c | |
| parent | a578b0407dc983aecd72028e1127062689b67089 (diff) | |
| download | ffmpeg-2d60444331fca1910510038dd3817bea885c2367.tar.gz | |
dsputil: Split motion estimation compare bits off into their own context
Diffstat (limited to 'libavcodec/ac3enc.c')
| -rw-r--r-- | libavcodec/ac3enc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index c6dc141eea..5c02e7f9de 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -36,6 +36,7 @@ #include "libavutil/internal.h" #include "libavutil/opt.h" #include "avcodec.h" +#include "me_cmp.h" #include "put_bits.h" #include "audiodsp.h" #include "ac3dsp.h" @@ -379,7 +380,7 @@ static void compute_exp_strategy(AC3EncodeContext *s) exp_strategy[blk] = EXP_NEW; continue; } - exp_diff = s->dsp.sad[0](NULL, exp, exp - AC3_MAX_COEFS, 16, 16); + exp_diff = s->mecc.sad[0](NULL, exp, exp - AC3_MAX_COEFS, 16, 16); exp_strategy[blk] = EXP_REUSE; if (ch == CPL_CH && exp_diff > (EXP_DIFF_THRESHOLD * (s->blocks[blk].end_freq[ch] - s->start_freq[ch]) / AC3_MAX_COEFS)) exp_strategy[blk] = EXP_NEW; @@ -2482,7 +2483,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx) goto init_fail; ff_audiodsp_init(&s->adsp); - ff_dsputil_init(&s->dsp, avctx); + ff_me_cmp_init(&s->mecc, avctx); ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT); dprint_options(s); |