Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
33a2b73b
Commit
33a2b73b
authored
Nov 30, 2016
by
James Almer
Committed by
Vittorio Giovara
Dec 02, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpeg4audio: correctly propagate meaningful error values
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
d82d5379
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
mpeg4audio.c
libavcodec/mpeg4audio.c
+5
-4
No files found.
libavcodec/mpeg4audio.c
View file @
33a2b73b
...
...
@@ -33,10 +33,10 @@
static
int
parse_config_ALS
(
GetBitContext
*
gb
,
MPEG4AudioConfig
*
c
)
{
if
(
get_bits_left
(
gb
)
<
112
)
return
-
1
;
return
AVERROR_INVALIDDATA
;
if
(
get_bits_long
(
gb
,
32
)
!=
MKBETAG
(
'A'
,
'L'
,
'S'
,
'\0'
))
return
-
1
;
return
AVERROR_INVALIDDATA
;
// override AudioSpecificConfig channel configuration and sample rate
// which are buggy in old ALS conformance files
...
...
@@ -116,8 +116,9 @@ int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
specific_config_bitindex
=
get_bits_count
(
&
gb
);
if
(
parse_config_ALS
(
&
gb
,
c
))
return
-
1
;
ret
=
parse_config_ALS
(
&
gb
,
c
);
if
(
ret
<
0
)
return
ret
;
}
if
(
c
->
ext_object_type
!=
AOT_SBR
&&
sync_extension
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment