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
35bbaa66
Commit
35bbaa66
authored
Sep 21, 2019
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: use avpriv_mpeg4audio_get_config2()
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
d582cc17
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
6 deletions
+5
-6
adtsenc.c
libavformat/adtsenc.c
+1
-1
isom.c
libavformat/isom.c
+2
-2
latmenc.c
libavformat/latmenc.c
+1
-1
matroskaenc.c
libavformat/matroskaenc.c
+1
-2
No files found.
libavformat/adtsenc.c
View file @
35bbaa66
...
@@ -53,7 +53,7 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui
...
@@ -53,7 +53,7 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui
int
off
;
int
off
;
init_get_bits
(
&
gb
,
buf
,
size
*
8
);
init_get_bits
(
&
gb
,
buf
,
size
*
8
);
off
=
avpriv_mpeg4audio_get_config
(
&
m4ac
,
buf
,
size
*
8
,
1
);
off
=
avpriv_mpeg4audio_get_config
2
(
&
m4ac
,
buf
,
size
,
1
,
s
);
if
(
off
<
0
)
if
(
off
<
0
)
return
off
;
return
off
;
skip_bits_long
(
&
gb
,
off
);
skip_bits_long
(
&
gb
,
off
);
...
...
libavformat/isom.c
View file @
35bbaa66
...
@@ -547,8 +547,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
...
@@ -547,8 +547,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
return
ret
;
return
ret
;
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_AAC
)
{
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_AAC
)
{
MPEG4AudioConfig
cfg
=
{
0
};
MPEG4AudioConfig
cfg
=
{
0
};
ret
=
avpriv_mpeg4audio_get_config
(
&
cfg
,
st
->
codecpar
->
extradata
,
ret
=
avpriv_mpeg4audio_get_config
2
(
&
cfg
,
st
->
codecpar
->
extradata
,
st
->
codecpar
->
extradata_size
*
8
,
1
);
st
->
codecpar
->
extradata_size
,
1
,
fc
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
st
->
codecpar
->
channels
=
cfg
.
channels
;
st
->
codecpar
->
channels
=
cfg
.
channels
;
...
...
libavformat/latmenc.c
View file @
35bbaa66
...
@@ -62,7 +62,7 @@ static int latm_decode_extradata(AVFormatContext *s, uint8_t *buf, int size)
...
@@ -62,7 +62,7 @@ static int latm_decode_extradata(AVFormatContext *s, uint8_t *buf, int size)
av_log
(
s
,
AV_LOG_ERROR
,
"Extradata is larger than currently supported.
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"Extradata is larger than currently supported.
\n
"
);
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
ctx
->
off
=
avpriv_mpeg4audio_get_config
(
&
m4ac
,
buf
,
size
*
8
,
1
);
ctx
->
off
=
avpriv_mpeg4audio_get_config
2
(
&
m4ac
,
buf
,
size
,
1
,
s
);
if
(
ctx
->
off
<
0
)
if
(
ctx
->
off
<
0
)
return
ctx
->
off
;
return
ctx
->
off
;
...
...
libavformat/matroskaenc.c
View file @
35bbaa66
...
@@ -717,8 +717,7 @@ static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extr
...
@@ -717,8 +717,7 @@ static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extr
MPEG4AudioConfig
mp4ac
;
MPEG4AudioConfig
mp4ac
;
int
ret
;
int
ret
;
ret
=
avpriv_mpeg4audio_get_config
(
&
mp4ac
,
extradata
,
ret
=
avpriv_mpeg4audio_get_config2
(
&
mp4ac
,
extradata
,
extradata_size
,
1
,
s
);
extradata_size
*
8
,
1
);
/* Don't abort if the failure is because of missing extradata. Assume in that
/* Don't abort if the failure is because of missing extradata. Assume in that
* case a bitstream filter will provide the muxer with the extradata in the
* case a bitstream filter will provide the muxer with the extradata in the
* first packet.
* first packet.
...
...
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