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
acc897e6
Commit
acc897e6
authored
Aug 28, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: make avpriv_flac_is_extradata_valid() private on the next bump
parent
e839de0f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
flac.c
libavcodec/flac.c
+8
-1
flac.h
libavcodec/flac.h
+6
-3
flacdec.c
libavcodec/flacdec.c
+1
-1
No files found.
libavcodec/flac.c
View file @
acc897e6
...
...
@@ -166,7 +166,7 @@ int ff_flac_get_max_frame_size(int blocksize, int ch, int bps)
return
count
;
}
int
avpriv
_flac_is_extradata_valid
(
AVCodecContext
*
avctx
,
int
ff
_flac_is_extradata_valid
(
AVCodecContext
*
avctx
,
enum
FLACExtradataFormat
*
format
,
uint8_t
**
streaminfo_start
)
{
...
...
@@ -243,4 +243,11 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
{
ff_flac_parse_streaminfo
(
avctx
,
s
,
buffer
);
}
int
avpriv_flac_is_extradata_valid
(
AVCodecContext
*
avctx
,
enum
FLACExtradataFormat
*
format
,
uint8_t
**
streaminfo_start
)
{
return
ff_flac_is_extradata_valid
(
avctx
,
format
,
streaminfo_start
);
}
#endif
libavcodec/flac.h
View file @
acc897e6
...
...
@@ -102,6 +102,9 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
#if LIBAVCODEC_VERSION_MAJOR < 57
void
avpriv_flac_parse_streaminfo
(
AVCodecContext
*
avctx
,
struct
FLACStreaminfo
*
s
,
const
uint8_t
*
buffer
);
int
avpriv_flac_is_extradata_valid
(
AVCodecContext
*
avctx
,
enum
FLACExtradataFormat
*
format
,
uint8_t
**
streaminfo_start
);
#endif
/**
...
...
@@ -111,9 +114,9 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
* @param[out] streaminfo_start pointer to start of 34-byte STREAMINFO data.
* @return 1 if valid, 0 if not valid.
*/
int
avpriv
_flac_is_extradata_valid
(
AVCodecContext
*
avctx
,
enum
FLACExtradataFormat
*
format
,
uint8_t
**
streaminfo_start
);
int
ff
_flac_is_extradata_valid
(
AVCodecContext
*
avctx
,
enum
FLACExtradataFormat
*
format
,
uint8_t
**
streaminfo_start
);
/**
* Calculate an estimate for the maximum frame size based on verbatim mode.
...
...
libavcodec/flacdec.c
View file @
acc897e6
...
...
@@ -97,7 +97,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
if
(
!
avctx
->
extradata
)
return
0
;
if
(
!
avpriv
_flac_is_extradata_valid
(
avctx
,
&
format
,
&
streaminfo
))
if
(
!
ff
_flac_is_extradata_valid
(
avctx
,
&
format
,
&
streaminfo
))
return
AVERROR_INVALIDDATA
;
/* initialize based on the demuxer-supplied streamdata 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