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
de9e199a
Commit
de9e199a
authored
Jan 02, 2015
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: make avpriv_mpa_decode_header private on next bump
It's not used by anything outside of lavc anymore.
parent
72d65876
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
mpegaudio_parser.c
libavcodec/mpegaudio_parser.c
+1
-1
mpegaudiodecheader.c
libavcodec/mpegaudiodecheader.c
+9
-1
mpegaudiodecheader.h
libavcodec/mpegaudiodecheader.h
+5
-0
No files found.
libavcodec/mpegaudio_parser.c
View file @
de9e199a
...
...
@@ -67,7 +67,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
state
=
(
state
<<
8
)
+
buf
[
i
++
];
ret
=
avpriv
_mpa_decode_header
(
avctx
,
state
,
&
sr
,
&
channels
,
&
frame_size
,
&
bit_rate
);
ret
=
ff
_mpa_decode_header
(
avctx
,
state
,
&
sr
,
&
channels
,
&
frame_size
,
&
bit_rate
);
if
(
ret
<
4
)
{
if
(
i
>
4
)
s
->
header_count
=
-
2
;
...
...
libavcodec/mpegaudiodecheader.c
View file @
de9e199a
...
...
@@ -118,7 +118,8 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header)
return
0
;
}
int
avpriv_mpa_decode_header
(
AVCodecContext
*
avctx
,
uint32_t
head
,
int
*
sample_rate
,
int
*
channels
,
int
*
frame_size
,
int
*
bit_rate
)
int
ff_mpa_decode_header
(
AVCodecContext
*
avctx
,
uint32_t
head
,
int
*
sample_rate
,
int
*
channels
,
int
*
frame_size
,
int
*
bit_rate
)
{
MPADecodeHeader
s1
,
*
s
=
&
s1
;
...
...
@@ -151,3 +152,10 @@ int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_r
*
bit_rate
=
s
->
bit_rate
;
return
s
->
frame_size
;
}
#if LIBAVCODEC_VERSION_MAJOR < 57
int
avpriv_mpa_decode_header
(
AVCodecContext
*
avctx
,
uint32_t
head
,
int
*
sample_rate
,
int
*
channels
,
int
*
frame_size
,
int
*
bit_rate
)
{
return
ff_mpa_decode_header
(
avctx
,
head
,
sample_rate
,
channels
,
frame_size
,
bit_rate
);
}
#endif
libavcodec/mpegaudiodecheader.h
View file @
de9e199a
...
...
@@ -54,7 +54,12 @@ int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header);
/* useful helper to get mpeg audio stream infos. Return -1 if error in
header, otherwise the coded frame size in bytes */
int
ff_mpa_decode_header
(
AVCodecContext
*
avctx
,
uint32_t
head
,
int
*
sample_rate
,
int
*
channels
,
int
*
frame_size
,
int
*
bitrate
);
#if LIBAVCODEC_VERSION_MAJOR < 57
int
avpriv_mpa_decode_header
(
AVCodecContext
*
avctx
,
uint32_t
head
,
int
*
sample_rate
,
int
*
channels
,
int
*
frame_size
,
int
*
bitrate
);
#endif
/* fast header check for resync */
static
inline
int
ff_mpa_check_header
(
uint32_t
header
){
...
...
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