1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

alsdec: check return values.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
This commit is contained in:
Thilo Borgmann 2012-03-27 18:06:54 +02:00 committed by Justin Ruggles
parent 66197988b1
commit ac3f5a6879

View File

@ -1348,7 +1348,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
}
} else { // multi-channel coding
ALSBlockData bd = { 0 };
int b;
int b, ret;
int *reverted_channels = ctx->reverted_channels;
unsigned int offset = 0;
@ -1381,9 +1381,10 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
bd.raw_samples = ctx->raw_samples[c] + offset;
bd.raw_other = NULL;
read_block(ctx, &bd);
if (read_channel_data(ctx, ctx->chan_data[c], c))
return -1;
if ((ret = read_block(ctx, &bd)) < 0)
return ret;
if ((ret = read_channel_data(ctx, ctx->chan_data[c], c)) < 0)
return ret;
}
for (c = 0; c < avctx->channels; c++)
@ -1402,7 +1403,8 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
bd.lpc_cof = ctx->lpc_cof[c];
bd.quant_cof = ctx->quant_cof[c];
bd.raw_samples = ctx->raw_samples[c] + offset;
decode_block(ctx, &bd);
if ((ret = decode_block(ctx, &bd)) < 0)
return ret;
}
memset(reverted_channels, 0, avctx->channels * sizeof(*reverted_channels));