diff options
| author | foo86 <foobaz86@gmail.com> | 2016-04-27 10:20:20 -0700 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-05-01 00:13:41 -0300 |
| commit | b286ff69c03e648453fd161f8ff1c4fcce396fa8 (patch) | |
| tree | ef80a486b59f26689f20a13c8f177b4c2389b166 /libavcodec/dcaenc.c | |
| parent | de28e73cce03b1de8b63683b70e4d0241161cca1 (diff) | |
| download | ffmpeg-b286ff69c03e648453fd161f8ff1c4fcce396fa8.tar.gz | |
avcodec/dcaenc: move channel reordering tables to dcaenc.h
DCA core decoder no longer uses fixed tables for channel reordering.
Move them into private encoder header (and drop ff_dca_ prefix).
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dcaenc.c')
| -rw-r--r-- | libavcodec/dcaenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index d562a27596..6bb7d2908c 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -137,9 +137,9 @@ static int encode_init(AVCodecContext *avctx) if (c->lfe_channel) { c->fullband_channels--; - c->channel_order_tab = ff_dca_channel_reorder_lfe[c->channel_config]; + c->channel_order_tab = channel_reorder_lfe[c->channel_config]; } else { - c->channel_order_tab = ff_dca_channel_reorder_nolfe[c->channel_config]; + c->channel_order_tab = channel_reorder_nolfe[c->channel_config]; } for (i = 0; i < 9; i++) { @@ -303,7 +303,7 @@ static void subband_transform(DCAEncContext *c, const int32_t *input) static void lfe_downsample(DCAEncContext *c, const int32_t *input) { /* FIXME: make 128x LFE downsampling possible */ - const int lfech = ff_dca_lfe_index[c->channel_config]; + const int lfech = lfe_index[c->channel_config]; int i, j, lfes; int32_t hist[512]; int32_t accum; |