Skip to content

F
ffmpeg.wasm-core
Commit 56a9d2b4 authored by Justin Ruggles's avatar Justin Ruggles
Browse files
Options

atrac3: move the 'version' field from ATRAC3Context to where it is used

parent 5ac673b5
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
libavcodec/atrac3.c
View file @ 56a9d2b4
...@@ -113,7 +113,6 @@ typedef struct ATRAC3Context { ...@@ -113,7 +113,6 @@ typedef struct ATRAC3Context {
//@} //@}
//@{ //@{
/** extradata */ /** extradata */
int version;
int delay; int delay;
int scrambled_stream; int scrambled_stream;
int frame_factor; int frame_factor;
...@@ -854,6 +853,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, ...@@ -854,6 +853,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
static av_cold int atrac3_decode_init(AVCodecContext *avctx) static av_cold int atrac3_decode_init(AVCodecContext *avctx)
{ {
int i, ret; int i, ret;
int version;
const uint8_t *edata_ptr = avctx->extradata; const uint8_t *edata_ptr = avctx->extradata;
ATRAC3Context *q = avctx->priv_data; ATRAC3Context *q = avctx->priv_data;
static VLC_TYPE atrac3_vlc_table[4096][2]; static VLC_TYPE atrac3_vlc_table[4096][2];
...@@ -885,7 +885,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) ...@@ -885,7 +885,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
/* setup */ /* setup */
q->samples_per_frame = SAMPLES_PER_FRAME * avctx->channels; q->samples_per_frame = SAMPLES_PER_FRAME * avctx->channels;
q->version = 4; version = 4;
q->delay = 0x88E; q->delay = 0x88E;
q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO; q->coding_mode = q->coding_mode ? JOINT_STEREO : STEREO;
q->scrambled_stream = 0; q->scrambled_stream = 0;
...@@ -900,7 +900,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) ...@@ -900,7 +900,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
} }
} else if (avctx->extradata_size == 10) { } else if (avctx->extradata_size == 10) {
/* Parse the extradata, RM format. */ /* Parse the extradata, RM format. */
q->version = bytestream_get_be32(&edata_ptr); version = bytestream_get_be32(&edata_ptr);
q->samples_per_frame = bytestream_get_be16(&edata_ptr); q->samples_per_frame = bytestream_get_be16(&edata_ptr);
q->delay = bytestream_get_be16(&edata_ptr); q->delay = bytestream_get_be16(&edata_ptr);
q->coding_mode = bytestream_get_be16(&edata_ptr); q->coding_mode = bytestream_get_be16(&edata_ptr);
...@@ -914,8 +914,8 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) ...@@ -914,8 +914,8 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
/* Check the extradata */ /* Check the extradata */
if (q->version != 4) { if (version != 4) {
av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", q->version); av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", version);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment