diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-02-13 17:57:05 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-06-22 18:22:31 -0700 |
commit | c67b449bebbe0b35c73b203683e77a0a649bc765 (patch) | |
tree | fef2691cbb548198024dbc1461419dfdd9d3fea2 /libavcodec/ac3dec.c | |
parent | 7b9ef8d701c319c26f7d0664fe977e176764c74e (diff) | |
download | ffmpeg-c67b449bebbe0b35c73b203683e77a0a649bc765.tar.gz |
dsputil: Split bswap*_buf() off into a separate context
Diffstat (limited to 'libavcodec/ac3dec.c')
-rw-r--r-- | libavcodec/ac3dec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 04876795d8..4876ac055d 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -33,6 +33,7 @@ #include "libavutil/crc.h" #include "libavutil/downmix_info.h" #include "libavutil/opt.h" +#include "bswapdsp.h" #include "internal.h" #include "aac_ac3_parser.h" #include "ac3_parser.h" @@ -180,7 +181,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) ff_mdct_init(&s->imdct_256, 8, 1, 1.0); ff_mdct_init(&s->imdct_512, 9, 1, 1.0); ff_kbd_window_init(s->window, 5.0, 256); - ff_dsputil_init(&s->dsp, avctx); + ff_bswapdsp_init(&s->bdsp); avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); ff_ac3dsp_init(&s->ac3dsp, avctx->flags & CODEC_FLAG_BITEXACT); ff_fmt_convert_init(&s->fmt_conv, avctx); @@ -1325,7 +1326,8 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, if (buf_size >= 2 && AV_RB16(buf) == 0x770B) { // seems to be byte-swapped AC-3 int cnt = FFMIN(buf_size, AC3_FRAME_BUFFER_SIZE) >> 1; - s->dsp.bswap16_buf((uint16_t *)s->input_buffer, (const uint16_t *)buf, cnt); + s->bdsp.bswap16_buf((uint16_t *) s->input_buffer, + (const uint16_t *) buf, cnt); } else memcpy(s->input_buffer, buf, FFMIN(buf_size, AC3_FRAME_BUFFER_SIZE)); buf = s->input_buffer; |