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
357db4c2
Commit
357db4c2
authored
Oct 17, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: use avpriv_ prefix for ff_split_xiph_headers.
It's used in lavf.
parent
2361e59b
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
vorbisdec.c
libavcodec/vorbisdec.c
+1
-1
vp3.c
libavcodec/vp3.c
+1
-1
xiph.c
libavcodec/xiph.c
+1
-1
xiph.h
libavcodec/xiph.h
+3
-3
matroskaenc.c
libavformat/matroskaenc.c
+1
-1
oggenc.c
libavformat/oggenc.c
+1
-1
sdp.c
libavformat/sdp.c
+1
-1
No files found.
libavcodec/vorbisdec.c
View file @
357db4c2
...
...
@@ -987,7 +987,7 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext)
return
-
1
;
}
if
(
ff
_split_xiph_headers
(
headers
,
headers_len
,
30
,
header_start
,
header_len
)
<
0
)
{
if
(
avpriv
_split_xiph_headers
(
headers
,
headers_len
,
30
,
header_start
,
header_len
)
<
0
)
{
av_log
(
avccontext
,
AV_LOG_ERROR
,
"Extradata corrupt.
\n
"
);
return
-
1
;
}
...
...
libavcodec/vp3.c
View file @
357db4c2
...
...
@@ -2275,7 +2275,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
return
-
1
;
}
if
(
ff
_split_xiph_headers
(
avctx
->
extradata
,
avctx
->
extradata_size
,
if
(
avpriv
_split_xiph_headers
(
avctx
->
extradata
,
avctx
->
extradata_size
,
42
,
header_start
,
header_len
)
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Corrupt extradata
\n
"
);
return
-
1
;
...
...
libavcodec/xiph.c
View file @
357db4c2
...
...
@@ -21,7 +21,7 @@
#include "libavutil/intreadwrite.h"
#include "xiph.h"
int
ff
_split_xiph_headers
(
uint8_t
*
extradata
,
int
extradata_size
,
int
avpriv
_split_xiph_headers
(
uint8_t
*
extradata
,
int
extradata_size
,
int
first_header_size
,
uint8_t
*
header_start
[
3
],
int
header_len
[
3
])
{
...
...
libavcodec/xiph.h
View file @
357db4c2
...
...
@@ -36,8 +36,8 @@
* @param[out] header_len The sizes of each of the three headers.
* @return On error a negative value is returned, on success zero.
*/
int
ff
_split_xiph_headers
(
uint8_t
*
extradata
,
int
extradata_size
,
int
first_header_size
,
uint8_t
*
header_start
[
3
],
int
header_len
[
3
]);
int
avpriv
_split_xiph_headers
(
uint8_t
*
extradata
,
int
extradata_size
,
int
first_header_size
,
uint8_t
*
header_start
[
3
],
int
header_len
[
3
]);
#endif
/* AVCODEC_XIPH_H */
libavformat/matroskaenc.c
View file @
357db4c2
...
...
@@ -423,7 +423,7 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecContex
else
first_header_size
=
42
;
if
(
ff
_split_xiph_headers
(
codec
->
extradata
,
codec
->
extradata_size
,
if
(
avpriv
_split_xiph_headers
(
codec
->
extradata
,
codec
->
extradata_size
,
first_header_size
,
header_start
,
header_len
)
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Extradata corrupt.
\n
"
);
return
-
1
;
...
...
libavformat/oggenc.c
View file @
357db4c2
...
...
@@ -377,7 +377,7 @@ static int ogg_write_header(AVFormatContext *s)
int
header_type
=
st
->
codec
->
codec_id
==
CODEC_ID_VORBIS
?
3
:
0x81
;
int
framing_bit
=
st
->
codec
->
codec_id
==
CODEC_ID_VORBIS
?
1
:
0
;
if
(
ff
_split_xiph_headers
(
st
->
codec
->
extradata
,
st
->
codec
->
extradata_size
,
if
(
avpriv
_split_xiph_headers
(
st
->
codec
->
extradata
,
st
->
codec
->
extradata_size
,
st
->
codec
->
codec_id
==
CODEC_ID_VORBIS
?
30
:
42
,
oggstream
->
header
,
oggstream
->
header_len
)
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Extradata corrupted
\n
"
);
...
...
libavformat/sdp.c
View file @
357db4c2
...
...
@@ -252,7 +252,7 @@ static char *xiph_extradata2config(AVCodecContext *c)
return
NULL
;
}
if
(
ff
_split_xiph_headers
(
c
->
extradata
,
c
->
extradata_size
,
if
(
avpriv
_split_xiph_headers
(
c
->
extradata
,
c
->
extradata_size
,
first_header_size
,
header_start
,
header_len
)
<
0
)
{
av_log
(
c
,
AV_LOG_ERROR
,
"Extradata corrupt.
\n
"
);
...
...
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