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
c070a875
Commit
c070a875
authored
Aug 28, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: make avpriv_flac_parse_streaminfo() private on the next bump
parent
7784f477
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
flac.c
libavcodec/flac.c
+9
-1
flac.h
libavcodec/flac.h
+5
-0
flacdec.c
libavcodec/flacdec.c
+2
-2
No files found.
libavcodec/flac.c
View file @
c070a875
...
@@ -201,7 +201,7 @@ void ff_flac_set_channel_layout(AVCodecContext *avctx)
...
@@ -201,7 +201,7 @@ void ff_flac_set_channel_layout(AVCodecContext *avctx)
avctx
->
channel_layout
=
0
;
avctx
->
channel_layout
=
0
;
}
}
void
avpriv
_flac_parse_streaminfo
(
AVCodecContext
*
avctx
,
struct
FLACStreaminfo
*
s
,
void
ff
_flac_parse_streaminfo
(
AVCodecContext
*
avctx
,
struct
FLACStreaminfo
*
s
,
const
uint8_t
*
buffer
)
const
uint8_t
*
buffer
)
{
{
GetBitContext
gb
;
GetBitContext
gb
;
...
@@ -236,3 +236,11 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
...
@@ -236,3 +236,11 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
skip_bits_long
(
&
gb
,
64
);
/* md5 sum */
skip_bits_long
(
&
gb
,
64
);
/* md5 sum */
skip_bits_long
(
&
gb
,
64
);
/* md5 sum */
skip_bits_long
(
&
gb
,
64
);
/* md5 sum */
}
}
#if LIBAVCODEC_VERSION_MAJOR < 57
void
avpriv_flac_parse_streaminfo
(
AVCodecContext
*
avctx
,
struct
FLACStreaminfo
*
s
,
const
uint8_t
*
buffer
)
{
ff_flac_parse_streaminfo
(
avctx
,
s
,
buffer
);
}
#endif
libavcodec/flac.h
View file @
c070a875
...
@@ -96,8 +96,13 @@ typedef struct FLACFrameInfo {
...
@@ -96,8 +96,13 @@ typedef struct FLACFrameInfo {
* @param[out] s where parsed information is stored
* @param[out] s where parsed information is stored
* @param[in] buffer pointer to start of 34-byte streaminfo data
* @param[in] buffer pointer to start of 34-byte streaminfo data
*/
*/
void
ff_flac_parse_streaminfo
(
AVCodecContext
*
avctx
,
struct
FLACStreaminfo
*
s
,
const
uint8_t
*
buffer
);
#if LIBAVCODEC_VERSION_MAJOR < 57
void
avpriv_flac_parse_streaminfo
(
AVCodecContext
*
avctx
,
struct
FLACStreaminfo
*
s
,
void
avpriv_flac_parse_streaminfo
(
AVCodecContext
*
avctx
,
struct
FLACStreaminfo
*
s
,
const
uint8_t
*
buffer
);
const
uint8_t
*
buffer
);
#endif
/**
/**
* Validate the FLAC extradata.
* Validate the FLAC extradata.
...
...
libavcodec/flacdec.c
View file @
c070a875
...
@@ -101,7 +101,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
...
@@ -101,7 +101,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
/* initialize based on the demuxer-supplied streamdata header */
/* initialize based on the demuxer-supplied streamdata header */
avpriv
_flac_parse_streaminfo
(
avctx
,
(
FLACStreaminfo
*
)
s
,
streaminfo
);
ff
_flac_parse_streaminfo
(
avctx
,
(
FLACStreaminfo
*
)
s
,
streaminfo
);
ret
=
allocate_buffers
(
s
);
ret
=
allocate_buffers
(
s
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
@@ -159,7 +159,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size)
...
@@ -159,7 +159,7 @@ static int parse_streaminfo(FLACContext *s, const uint8_t *buf, int buf_size)
metadata_size
!=
FLAC_STREAMINFO_SIZE
)
{
metadata_size
!=
FLAC_STREAMINFO_SIZE
)
{
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
}
}
avpriv
_flac_parse_streaminfo
(
s
->
avctx
,
(
FLACStreaminfo
*
)
s
,
&
buf
[
8
]);
ff
_flac_parse_streaminfo
(
s
->
avctx
,
(
FLACStreaminfo
*
)
s
,
&
buf
[
8
]);
ret
=
allocate_buffers
(
s
);
ret
=
allocate_buffers
(
s
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
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