[FFmpeg-cvslog] atrac3: remove unused ATRAC3Context field, samples_per_channel
Justin Ruggles
git at videolan.org
Tue Oct 23 12:49:30 CEST 2012
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Oct 18 22:48:45 2012 -0400| [7c1f93afe6b03efc356442f748cb6daede8688ea] | committer: Justin Ruggles
atrac3: remove unused ATRAC3Context field, samples_per_channel
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c1f93afe6b03efc356442f748cb6daede8688ea
---
libavcodec/atrac3.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 76f2b22..e23ff98 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 {
More information about the ffmpeg-cvslog
mailing list