[FFmpeg-devel,3/6] atrac3plus_parser: use libavcodec's oma

Submitted by misty@brew.sh on Dec. 25, 2017, 2:28 a.m.

Details

Message ID 20171225022834.33865-4-misty@brew.sh
State New
Headers show

Commit Message

misty@brew.sh Dec. 25, 2017, 2:28 a.m.
From: Misty De Meo <mistydemeo@gmail.com>

---
 libavcodec/atrac3plus_parser.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libavcodec/atrac3plus_parser.c b/libavcodec/atrac3plus_parser.c
index 01fcad4c45..f58f3d58ef 100644
--- a/libavcodec/atrac3plus_parser.c
+++ b/libavcodec/atrac3plus_parser.c
@@ -20,7 +20,7 @@ 
 
 #include "parser.h"
 #include "get_bits.h"
-#include "libavformat/oma.h"
+#include "oma.h"
 
 typedef struct Atrac3PlusParseContext {
     ParseContext pc;
@@ -38,7 +38,7 @@  static int parse_sound_frame_header(Atrac3PlusParseContext *c,
         return AVERROR_INVALIDDATA;
 
     atrac_config = AV_RB16(&buf[2]);
-    c->sample_rate = ff_oma_srate_tab[(atrac_config >> 13) & 7] * 100;
+    c->sample_rate = oma_srate_tab[(atrac_config >> 13) & 7] * 100;
     c->channel_id  = (atrac_config >> 10) & 7;
     c->frame_size  = ((atrac_config & 0x3FF) * 8) + 8;
 
@@ -120,8 +120,8 @@  static int ff_atrac3p_parse(AVCodecParserContext *s,
         avctx->sample_rate    = ctx->sample_rate;
         avctx->block_align    = ctx->frame_size;
         avctx->bit_rate       = ctx->sample_rate * ctx->frame_size * 8 / 2048;
-        avctx->channels       = ff_oma_chid_to_num_channels[ctx->channel_id - 1];
-        avctx->channel_layout = ff_oma_chid_to_native_layout[ctx->channel_id - 1];
+        avctx->channels       = oma_chid_to_num_channels[ctx->channel_id - 1];
+        avctx->channel_layout = oma_chid_to_native_layout[ctx->channel_id - 1];
 
         next += hdr_bytes;
         buf  += hdr_bytes;