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
67286fa9
Commit
67286fa9
authored
Dec 30, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.
Both libavformat and libavcodec requires this function.
parent
5c68aae9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
dvdsubenc.c
libavcodec/dvdsubenc.c
+1
-1
internal.h
libavcodec/internal.h
+1
-1
utils.c
libavcodec/utils.c
+1
-1
assdec.c
libavformat/assdec.c
+1
-1
jacosubdec.c
libavformat/jacosubdec.c
+1
-1
samidec.c
libavformat/samidec.c
+1
-1
subviewerdec.c
libavformat/subviewerdec.c
+1
-1
No files found.
libavcodec/dvdsubenc.c
View file @
67286fa9
...
@@ -409,7 +409,7 @@ static int dvdsub_init(AVCodecContext *avctx)
...
@@ -409,7 +409,7 @@ static int dvdsub_init(AVCodecContext *avctx)
av_bprintf
(
&
extradata
,
" %06"
PRIx32
"%c"
,
av_bprintf
(
&
extradata
,
" %06"
PRIx32
"%c"
,
dvdc
->
global_palette
[
i
]
&
0xFFFFFF
,
i
<
15
?
','
:
'\n'
);
dvdc
->
global_palette
[
i
]
&
0xFFFFFF
,
i
<
15
?
','
:
'\n'
);
ret
=
ff
_bprint_to_extradata
(
avctx
,
&
extradata
);
ret
=
avpriv
_bprint_to_extradata
(
avctx
,
&
extradata
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
libavcodec/internal.h
View file @
67286fa9
...
@@ -204,6 +204,6 @@ int ff_codec_close_recursive(AVCodecContext *avctx);
...
@@ -204,6 +204,6 @@ int ff_codec_close_recursive(AVCodecContext *avctx);
/**
/**
* Finalize buf into extradata and set its size appropriately.
* Finalize buf into extradata and set its size appropriately.
*/
*/
int
ff
_bprint_to_extradata
(
AVCodecContext
*
avctx
,
struct
AVBPrint
*
buf
);
int
avpriv
_bprint_to_extradata
(
AVCodecContext
*
avctx
,
struct
AVBPrint
*
buf
);
#endif
/* AVCODEC_INTERNAL_H */
#endif
/* AVCODEC_INTERNAL_H */
libavcodec/utils.c
View file @
67286fa9
...
@@ -2686,7 +2686,7 @@ int avcodec_is_open(AVCodecContext *s)
...
@@ -2686,7 +2686,7 @@ int avcodec_is_open(AVCodecContext *s)
return
!!
s
->
internal
;
return
!!
s
->
internal
;
}
}
int
ff
_bprint_to_extradata
(
AVCodecContext
*
avctx
,
struct
AVBPrint
*
buf
)
int
avpriv
_bprint_to_extradata
(
AVCodecContext
*
avctx
,
struct
AVBPrint
*
buf
)
{
{
int
ret
;
int
ret
;
char
*
str
;
char
*
str
;
...
...
libavformat/assdec.c
View file @
67286fa9
...
@@ -133,7 +133,7 @@ static int ass_read_header(AVFormatContext *s)
...
@@ -133,7 +133,7 @@ static int ass_read_header(AVFormatContext *s)
av_bprint_finalize
(
&
line
,
NULL
);
av_bprint_finalize
(
&
line
,
NULL
);
res
=
ff
_bprint_to_extradata
(
st
->
codec
,
&
header
);
res
=
avpriv
_bprint_to_extradata
(
st
->
codec
,
&
header
);
if
(
res
<
0
)
if
(
res
<
0
)
goto
end
;
goto
end
;
...
...
libavformat/jacosubdec.c
View file @
67286fa9
...
@@ -229,7 +229,7 @@ static int jacosub_read_header(AVFormatContext *s)
...
@@ -229,7 +229,7 @@ static int jacosub_read_header(AVFormatContext *s)
}
}
/* general/essential directives in the extradata */
/* general/essential directives in the extradata */
ret
=
ff
_bprint_to_extradata
(
st
->
codec
,
&
header
);
ret
=
avpriv
_bprint_to_extradata
(
st
->
codec
,
&
header
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
...
libavformat/samidec.c
View file @
67286fa9
...
@@ -92,7 +92,7 @@ static int sami_read_header(AVFormatContext *s)
...
@@ -92,7 +92,7 @@ static int sami_read_header(AVFormatContext *s)
av_bprint_clear
(
&
buf
);
av_bprint_clear
(
&
buf
);
}
}
res
=
ff
_bprint_to_extradata
(
st
->
codec
,
&
hdr_buf
);
res
=
avpriv
_bprint_to_extradata
(
st
->
codec
,
&
hdr_buf
);
if
(
res
<
0
)
if
(
res
<
0
)
goto
end
;
goto
end
;
...
...
libavformat/subviewerdec.c
View file @
67286fa9
...
@@ -100,7 +100,7 @@ static int subviewer_read_header(AVFormatContext *s)
...
@@ -100,7 +100,7 @@ static int subviewer_read_header(AVFormatContext *s)
av_bprintf
(
&
header
,
"%s"
,
line
);
av_bprintf
(
&
header
,
"%s"
,
line
);
if
(
!
strncmp
(
line
,
"[END INFORMATION]"
,
17
)
||
!
strncmp
(
line
,
"[SUBTITLE]"
,
10
))
{
if
(
!
strncmp
(
line
,
"[END INFORMATION]"
,
17
)
||
!
strncmp
(
line
,
"[SUBTITLE]"
,
10
))
{
/* end of header */
/* end of header */
res
=
ff
_bprint_to_extradata
(
st
->
codec
,
&
header
);
res
=
avpriv
_bprint_to_extradata
(
st
->
codec
,
&
header
);
if
(
res
<
0
)
if
(
res
<
0
)
goto
end
;
goto
end
;
}
else
if
(
strncmp
(
line
,
"[INFORMATION]"
,
13
))
{
}
else
if
(
strncmp
(
line
,
"[INFORMATION]"
,
13
))
{
...
...
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