[FFmpeg-cvslog] atrac3: move the 'version' field from ATRAC3Context to where it is used

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Oct 18 17:14:59 2012 -0400| [56a9d2b44e976adc23472901d936a696364ea80e] | committer: Justin Ruggles

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56a9d2b44e976adc23472901d936a696364ea80e
---

 libavcodec/atrac3.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 40f2a6d..0d1bc14 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -113,7 +113,6 @@ typedef struct ATRAC3Context {
     //@}
     //@{
     /** extradata */
-    int version;
     int delay;
     int scrambled_stream;
     int frame_factor;
@@ -854,6 +853,7 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
 static av_cold int atrac3_decode_init(AVCodecContext *avctx)
 {
     int i, ret;
+    int version;
     const uint8_t *edata_ptr = avctx->extradata;
     ATRAC3Context *q = avctx->priv_data;
     static VLC_TYPE atrac3_vlc_table[4096][2];
@@ -885,7 +885,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
 
         /* setup */
         q->samples_per_frame = SAMPLES_PER_FRAME * avctx->channels;
-        q->version           = 4;
+        version              = 4;
         q->delay             = 0x88E;
         q->coding_mode       = q->coding_mode ? JOINT_STEREO : STEREO;
         q->scrambled_stream  = 0;
@@ -900,7 +900,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
         }
     } else if (avctx->extradata_size == 10) {
         /* 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->delay               = 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)
 
     /* Check the extradata */
 
-    if (q->version != 4) {
-        av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", q->version);
+    if (version != 4) {
+        av_log(avctx, AV_LOG_ERROR, "Version %d != 4.\n", version);
         return AVERROR_INVALIDDATA;
     }