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
0fc684ff
Commit
0fc684ff
authored
Aug 29, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aacdec: pass AVPacket to aac_decode_frame_int()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
818f3dc9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
aacdec.c
libavcodec/aacdec.c
+3
-3
No files found.
libavcodec/aacdec.c
View file @
0fc684ff
...
...
@@ -2392,7 +2392,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
}
static
int
aac_decode_frame_int
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame_ptr
,
GetBitContext
*
gb
)
int
*
got_frame_ptr
,
GetBitContext
*
gb
,
AVPacket
*
avpkt
)
{
AACContext
*
ac
=
avctx
->
priv_data
;
ChannelElement
*
che
=
NULL
,
*
che_prev
=
NULL
;
...
...
@@ -2579,7 +2579,7 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
init_get_bits
(
&
gb
,
buf
,
buf_size
*
8
);
if
((
err
=
aac_decode_frame_int
(
avctx
,
data
,
got_frame_ptr
,
&
gb
))
<
0
)
if
((
err
=
aac_decode_frame_int
(
avctx
,
data
,
got_frame_ptr
,
&
gb
,
avpkt
))
<
0
)
return
err
;
buf_consumed
=
(
get_bits_count
(
&
gb
)
+
7
)
>>
3
;
...
...
@@ -2864,7 +2864,7 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out,
return
AVERROR_INVALIDDATA
;
}
if
((
err
=
aac_decode_frame_int
(
avctx
,
out
,
got_frame_ptr
,
&
gb
))
<
0
)
if
((
err
=
aac_decode_frame_int
(
avctx
,
out
,
got_frame_ptr
,
&
gb
,
avpkt
))
<
0
)
return
err
;
return
muxlength
;
...
...
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