From 7c1f93afe6b03efc356442f748cb6daede8688ea Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 18 Oct 2012 22:48:45 -0400 Subject: [PATCH] atrac3: remove unused ATRAC3Context field, samples_per_channel --- libavcodec/atrac3.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 76f2b22070..e23ff9847e 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -92,7 +92,6 @@ typedef struct ATRAC3Context { int coding_mode; int bit_rate; int sample_rate; - int samples_per_channel; int samples_per_frame; ChannelUnit *units; @@ -870,7 +869,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) /* Parse the extradata, WAV format */ av_log(avctx, AV_LOG_DEBUG, "[0-1] %d\n", bytestream_get_le16(&edata_ptr)); // Unknown value always 1 - q->samples_per_channel = bytestream_get_le32(&edata_ptr); + edata_ptr += 4; // samples per channel q->coding_mode = bytestream_get_le16(&edata_ptr); av_log(avctx, AV_LOG_DEBUG,"[8-9] %d\n", bytestream_get_le16(&edata_ptr)); //Dupe of coding mode @@ -899,7 +898,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) q->samples_per_frame = bytestream_get_be16(&edata_ptr); delay = bytestream_get_be16(&edata_ptr); q->coding_mode = bytestream_get_be16(&edata_ptr); - q->samples_per_channel = q->samples_per_frame / avctx->channels; q->scrambled_stream = 1; } else {