Skip to content

F
ffmpeg.wasm-core
Commit 33a2b73b authored by James Almer's avatar James Almer Committed by Vittorio Giovara
Browse files
Options

mpeg4audio: correctly propagate meaningful error values 

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent d82d5379
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
libavcodec/mpeg4audio.c
View file @ 33a2b73b
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c) static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c)
{ {
if (get_bits_left(gb) < 112) if (get_bits_left(gb) < 112)
return -1; return AVERROR_INVALIDDATA;
if (get_bits_long(gb, 32) != MKBETAG('A','L','S','\0')) if (get_bits_long(gb, 32) != MKBETAG('A','L','S','\0'))
return -1; return AVERROR_INVALIDDATA;
// override AudioSpecificConfig channel configuration and sample rate // override AudioSpecificConfig channel configuration and sample rate
// which are buggy in old ALS conformance files // which are buggy in old ALS conformance files
...@@ -116,8 +116,9 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, ...@@ -116,8 +116,9 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
specific_config_bitindex = get_bits_count(&gb); specific_config_bitindex = get_bits_count(&gb);
if (parse_config_ALS(&gb, c)) ret = parse_config_ALS(&gb, c);
return -1; if (ret < 0)
return ret;
} }
if (c->ext_object_type != AOT_SBR && sync_extension) { if (c->ext_object_type != AOT_SBR && sync_extension) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment