RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use enum value instead of numerical value for acmod 

Originally committed as revision 9781 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2007-07-23 22:47:49 +00:00
parent bc8edb7e53
commit e2cd6686fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ac3dec.c
View File

@ -1348,7 +1348,7 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk)
for (i = 0; i < nfchans; i++) for (i = 0; i < nfchans; i++)
ctx->chincpl[i] = get_bits1(gb); ctx->chincpl[i] = get_bits1(gb);
if (acmod == 0x02) if (acmod == AC3_ACMOD_STEREO)
ctx->phsflginu = get_bits1(gb); //phase flag in use ctx->phsflginu = get_bits1(gb); //phase flag in use
ctx->cplbegf = get_bits(gb, 4); ctx->cplbegf = get_bits(gb, 4);
@ -1392,13 +1392,13 @@ static int ac3_parse_audio_block(AC3DecodeContext *ctx, int blk)
} }
} }
if (acmod == 0x02 && ctx->phsflginu && (ctx->cplcoe & 1 || ctx->cplcoe & 2)) if (acmod == AC3_ACMOD_STEREO && ctx->phsflginu && (ctx->cplcoe & 1 || ctx->cplcoe & 2))
for (bnd = 0; bnd < ctx->ncplbnd; bnd++) for (bnd = 0; bnd < ctx->ncplbnd; bnd++)
if (get_bits1(gb)) if (get_bits1(gb))
ctx->cplco[1][bnd] = -ctx->cplco[1][bnd]; ctx->cplco[1][bnd] = -ctx->cplco[1][bnd];
} }
if (acmod == 0x02) {/* rematrixing */ if (acmod == AC3_ACMOD_STEREO) {/* rematrixing */
ctx->rematstr = get_bits1(gb); ctx->rematstr = get_bits1(gb);
if (ctx->rematstr) { if (ctx->rematstr) {
if (!(ctx->cplinu) || ctx->cplbegf > 2) if (!(ctx->cplinu) || ctx->cplbegf > 2)