summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2007-08-04 11:55:10 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2007-08-04 11:55:10 +0000
commitfc59010bbfb2a79d5b7cb5576e3110d48c7d20d0 (patch)
tree84f75e4645cfe25bf31e00e9f4d97e37ddc9ff52 /libavcodec
parent6d96d626c6df6d6e72784495e8e55a5ea65d87ac (diff)
change AC3DecodeContext variable to local variable
Originally committed as revision 9892 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ac3dec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 1a8ca96f84..6368eb0c82 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -99,7 +99,6 @@ typedef struct {
int cplinu;
int chincpl[AC3_MAX_CHANNELS];
int phsflginu;
- int cplcoe;
int cplbndstrc[18];
int rematstr;
int nrematbnd;
@@ -762,12 +761,12 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk)
}
if (ctx->cplinu) {
- ctx->cplcoe = 0;
+ int cplcoe = 0;
for (i = 0; i < nfchans; i++)
if (ctx->chincpl[i])
if (get_bits1(gb)) { /* coupling co-ordinates */
- ctx->cplcoe |= 1 << i;
+ cplcoe = 1;
mstrcplco = 3 * get_bits(gb, 2);
for (bnd = 0; bnd < ctx->ncplbnd; bnd++) {
cplcoexp = get_bits(gb, 4);
@@ -780,7 +779,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk)
}
}
- if (acmod == AC3_ACMOD_STEREO && ctx->phsflginu && (ctx->cplcoe & 1 || ctx->cplcoe & 2))
+ if (acmod == AC3_ACMOD_STEREO && ctx->phsflginu && cplcoe)
for (bnd = 0; bnd < ctx->ncplbnd; bnd++)
if (get_bits1(gb))
ctx->cplco[1][bnd] = -ctx->cplco[1][bnd];