From: noboru2000 <nob...@ieee.org>
A highest_decoded_channel flag is modified to serve as meant.
Signed-off-by: noboru2000 <nob...@ieee.org>
Regression since: a11aa5f3ed7ee4d2385a7b725d43f6070d790b4c
Fixes: Sin48k16bit1ch.mp4
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/alsdec.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 0aada77450..ba873ec53a 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -1632,7 +1632,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned
int ra_frame)
AVCodecContext *avctx = ctx->avctx;
GetBitContext *gb = &ctx->gb;
unsigned int div_blocks[32]; ///< block sizes.
- unsigned int c;
+ int c;
unsigned int js_blocks[2];
uint32_t bs_info = 0;
int ret;
@@ -1810,14 +1810,17 @@ static int decode_frame(AVCodecContext *avctx, void
*data, int *got_frame_ptr,
else
ctx->cur_frame_length = sconf->frame_length;
- ctx->highest_decoded_channel = 0;
+ ctx->highest_decoded_channel = -1;
// decode the frame data
if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0)
av_log(ctx->avctx, AV_LOG_WARNING,
"Reading frame data failed. Skipping RA unit.\n");
- if (ctx->highest_decoded_channel == 0)
+ if (ctx->highest_decoded_channel == -1) {
+ av_log(ctx->avctx, AV_LOG_WARNING,
+ "No channel data decoded.\n");
return AVERROR_INVALIDDATA;
+ }
ctx->frame_id++;
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
