Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
73ae27e1
Commit
73ae27e1
authored
Oct 17, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: use avpriv_ prefix for ff_aac_parse_header().
It's used in lavf.
parent
8d74bf17
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
aac_adtstoasc_bsf.c
libavcodec/aac_adtstoasc_bsf.c
+1
-1
aac_parser.c
libavcodec/aac_parser.c
+1
-1
aacadtsdec.c
libavcodec/aacadtsdec.c
+1
-1
aacadtsdec.h
libavcodec/aacadtsdec.h
+1
-1
aacdec.c
libavcodec/aacdec.c
+1
-1
spdifdec.c
libavformat/spdifdec.c
+1
-1
spdifenc.c
libavformat/spdifenc.c
+1
-1
No files found.
libavcodec/aac_adtstoasc_bsf.c
View file @
73ae27e1
...
...
@@ -55,7 +55,7 @@ static int aac_adtstoasc_filter(AVBitStreamFilterContext *bsfc,
if
(
show_bits
(
&
gb
,
12
)
!=
0xfff
)
return
0
;
if
(
ff
_aac_parse_header
(
&
gb
,
&
hdr
)
<
0
)
{
if
(
avpriv
_aac_parse_header
(
&
gb
,
&
hdr
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error parsing ADTS frame header!
\n
"
);
return
-
1
;
}
...
...
libavcodec/aac_parser.c
View file @
73ae27e1
...
...
@@ -40,7 +40,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
tmp
.
u64
=
av_be2ne64
(
state
);
init_get_bits
(
&
bits
,
tmp
.
u8
+
8
-
AAC_ADTS_HEADER_SIZE
,
AAC_ADTS_HEADER_SIZE
*
8
);
if
((
size
=
ff
_aac_parse_header
(
&
bits
,
&
hdr
))
<
0
)
if
((
size
=
avpriv
_aac_parse_header
(
&
bits
,
&
hdr
))
<
0
)
return
0
;
*
need_next_header
=
0
;
*
new_frame_start
=
1
;
...
...
libavcodec/aacadtsdec.c
View file @
73ae27e1
...
...
@@ -26,7 +26,7 @@
#include "get_bits.h"
#include "mpeg4audio.h"
int
ff
_aac_parse_header
(
GetBitContext
*
gbc
,
AACADTSHeaderInfo
*
hdr
)
int
avpriv
_aac_parse_header
(
GetBitContext
*
gbc
,
AACADTSHeaderInfo
*
hdr
)
{
int
size
,
rdb
,
ch
,
sr
;
int
aot
,
crc_abs
;
...
...
libavcodec/aacadtsdec.h
View file @
73ae27e1
...
...
@@ -49,6 +49,6 @@ typedef struct {
* -2 if the version element is invalid, -3 if the sample rate
* element is invalid, or -4 if the bit rate element is invalid.
*/
int
ff
_aac_parse_header
(
GetBitContext
*
gbc
,
AACADTSHeaderInfo
*
hdr
);
int
avpriv
_aac_parse_header
(
GetBitContext
*
gbc
,
AACADTSHeaderInfo
*
hdr
);
#endif
/* AVCODEC_AACADTSDEC_H */
libavcodec/aacdec.c
View file @
73ae27e1
...
...
@@ -2075,7 +2075,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
int
size
;
AACADTSHeaderInfo
hdr_info
;
size
=
ff
_aac_parse_header
(
gb
,
&
hdr_info
);
size
=
avpriv
_aac_parse_header
(
gb
,
&
hdr_info
);
if
(
size
>
0
)
{
if
(
ac
->
output_configured
!=
OC_LOCKED
&&
hdr_info
.
chan_config
)
{
enum
ChannelPosition
new_che_pos
[
4
][
MAX_ELEM_ID
];
...
...
libavformat/spdifdec.c
View file @
73ae27e1
...
...
@@ -57,7 +57,7 @@ static int spdif_get_offset_and_codec(AVFormatContext *s,
break
;
case
IEC61937_MPEG2_AAC
:
init_get_bits
(
&
gbc
,
buf
,
AAC_ADTS_HEADER_SIZE
*
8
);
if
(
ff
_aac_parse_header
(
&
gbc
,
&
aac_hdr
))
{
if
(
avpriv
_aac_parse_header
(
&
gbc
,
&
aac_hdr
))
{
if
(
s
)
/* be silent during a probe */
av_log
(
s
,
AV_LOG_ERROR
,
"Invalid AAC packet in IEC 61937
\n
"
);
return
AVERROR_INVALIDDATA
;
...
...
libavformat/spdifenc.c
View file @
73ae27e1
...
...
@@ -349,7 +349,7 @@ static int spdif_header_aac(AVFormatContext *s, AVPacket *pkt)
int
ret
;
init_get_bits
(
&
gbc
,
pkt
->
data
,
AAC_ADTS_HEADER_SIZE
*
8
);
ret
=
ff
_aac_parse_header
(
&
gbc
,
&
hdr
);
ret
=
avpriv
_aac_parse_header
(
&
gbc
,
&
hdr
);
if
(
ret
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Wrong AAC file format
\n
"
);
return
AVERROR_INVALIDDATA
;
...
...
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