Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
0bc5d4fd
Commit
0bc5d4fd
authored
Sep 23, 2011
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aacdec: fix channel reconfigs on LATM
Fixes Ticket200 Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
b6aaa6d9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
aacdec.c
libavcodec/aacdec.c
+3
-1
No files found.
libavcodec/aacdec.c
View file @
0bc5d4fd
...
@@ -2313,6 +2313,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
...
@@ -2313,6 +2313,7 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
{
{
AVCodecContext
*
avctx
=
latmctx
->
aac_ctx
.
avctx
;
AVCodecContext
*
avctx
=
latmctx
->
aac_ctx
.
avctx
;
MPEG4AudioConfig
m4ac
;
MPEG4AudioConfig
m4ac
;
AACContext
*
ac
=
&
latmctx
->
aac_ctx
;
int
config_start_bit
=
get_bits_count
(
gb
);
int
config_start_bit
=
get_bits_count
(
gb
);
int
bits_consumed
,
esize
;
int
bits_consumed
,
esize
;
...
@@ -2322,12 +2323,13 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
...
@@ -2322,12 +2323,13 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx,
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
else
{
}
else
{
bits_consumed
=
bits_consumed
=
decode_audio_specific_config
(
NULL
,
avctx
,
&
m4ac
,
decode_audio_specific_config
(
ac
,
avctx
,
&
m4ac
,
gb
->
buffer
+
(
config_start_bit
/
8
),
gb
->
buffer
+
(
config_start_bit
/
8
),
get_bits_left
(
gb
)
/
8
,
asclen
);
get_bits_left
(
gb
)
/
8
,
asclen
);
if
(
bits_consumed
<
0
)
if
(
bits_consumed
<
0
)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
ac
->
m4ac
=
m4ac
;
esize
=
(
bits_consumed
+
7
)
/
8
;
esize
=
(
bits_consumed
+
7
)
/
8
;
...
...
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