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
6f89efea
Commit
6f89efea
authored
Oct 17, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: use avpriv_ prefix for ff_ac3_parse_header.
It's used in lavf.
parent
9138a130
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
ac3_parser.c
libavcodec/ac3_parser.c
+2
-2
ac3_parser.h
libavcodec/ac3_parser.h
+1
-1
ac3dec.c
libavcodec/ac3dec.c
+1
-1
ac3dec.c
libavformat/ac3dec.c
+1
-1
No files found.
libavcodec/ac3_parser.c
View file @
6f89efea
...
...
@@ -35,7 +35,7 @@ static const uint8_t eac3_blocks[4] = {
};
int
ff
_ac3_parse_header
(
GetBitContext
*
gbc
,
AC3HeaderInfo
*
hdr
)
int
avpriv
_ac3_parse_header
(
GetBitContext
*
gbc
,
AC3HeaderInfo
*
hdr
)
{
int
frame_size_code
;
...
...
@@ -141,7 +141,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
GetBitContext
gbc
;
init_get_bits
(
&
gbc
,
tmp
.
u8
+
8
-
AC3_HEADER_SIZE
,
54
);
err
=
ff
_ac3_parse_header
(
&
gbc
,
&
hdr
);
err
=
avpriv
_ac3_parse_header
(
&
gbc
,
&
hdr
);
if
(
err
<
0
)
return
0
;
...
...
libavcodec/ac3_parser.h
View file @
6f89efea
...
...
@@ -36,6 +36,6 @@
* -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
* element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
*/
int
ff
_ac3_parse_header
(
GetBitContext
*
gbc
,
AC3HeaderInfo
*
hdr
);
int
avpriv
_ac3_parse_header
(
GetBitContext
*
gbc
,
AC3HeaderInfo
*
hdr
);
#endif
/* AVCODEC_AC3_PARSER_H */
libavcodec/ac3dec.c
View file @
6f89efea
...
...
@@ -261,7 +261,7 @@ static int parse_frame_header(AC3DecodeContext *s)
AC3HeaderInfo
hdr
;
int
err
;
err
=
ff
_ac3_parse_header
(
&
s
->
gbc
,
&
hdr
);
err
=
avpriv
_ac3_parse_header
(
&
s
->
gbc
,
&
hdr
);
if
(
err
)
return
err
;
...
...
libavformat/ac3dec.c
View file @
6f89efea
...
...
@@ -41,7 +41,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum CodecID expected_codec_id)
for
(
frames
=
0
;
buf2
<
end
;
frames
++
)
{
init_get_bits
(
&
gbc
,
buf2
,
54
);
if
(
ff
_ac3_parse_header
(
&
gbc
,
&
hdr
)
<
0
)
if
(
avpriv
_ac3_parse_header
(
&
gbc
,
&
hdr
)
<
0
)
break
;
if
(
buf2
+
hdr
.
frame_size
>
end
||
av_crc
(
av_crc_get_table
(
AV_CRC_16_ANSI
),
0
,
buf2
+
2
,
hdr
.
frame_size
-
2
))
...
...
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