From cf1d794a490444e710dc16606fa57c0db96d5f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 25 Jan 2011 02:59:31 +0100 Subject: [PATCH] Make ff_ass_subtitle_header static to ass.c Signed-off-by: Janne Grunau --- libavcodec/ass.c | 25 ++++++++++++++++++++----- libavcodec/ass.h | 21 --------------------- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 7553bf0778..0662b8dfdf 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -22,11 +22,26 @@ #include "avcodec.h" #include "ass.h" -int ff_ass_subtitle_header(AVCodecContext *avctx, - const char *font, int font_size, - int color, int back_color, - int bold, int italic, int underline, - int alignment) +/** + * Generate a suitable AVCodecContext.subtitle_header for SUBTITLE_ASS. + * + * @param avctx pointer to the AVCodecContext + * @param font name of the default font face to use + * @param font_size default font size to use + * @param color default text color to use (ABGR) + * @param back_color default background color to use (ABGR) + * @param bold 1 for bold text, 0 for normal text + * @param italic 1 for italic text, 0 for normal text + * @param underline 1 for underline text, 0 for normal text + * @param alignment position of the text (left, center, top...), defined after + * the layout of the numpad (1-3 sub, 4-6 mid, 7-9 top) + * @return >= 0 on success otherwise an error code <0 + */ +static int ff_ass_subtitle_header(AVCodecContext *avctx, + const char *font, int font_size, + int color, int back_color, + int bold, int italic, int underline, + int alignment) { char header[512]; diff --git a/libavcodec/ass.h b/libavcodec/ass.h index e04b4cc747..f29a7c4697 100644 --- a/libavcodec/ass.h +++ b/libavcodec/ass.h @@ -39,27 +39,6 @@ #define ASS_DEFAULT_ALIGNMENT 2 /** @} */ -/** - * Generate a suitable AVCodecContext.subtitle_header for SUBTITLE_ASS. - * - * @param avctx pointer to the AVCodecContext - * @param font name of the default font face to use - * @param font_size default font size to use - * @param color default text color to use (ABGR) - * @param back_color default background color to use (ABGR) - * @param bold 1 for bold text, 0 for normal text - * @param italic 1 for italic text, 0 for normal text - * @param underline 1 for underline text, 0 for normal text - * @param alignment position of the text (left, center, top...), defined after - * the layout of the numpad (1-3 sub, 4-6 mid, 7-9 top) - * @return >= 0 on success otherwise an error code <0 - */ -int ff_ass_subtitle_header(AVCodecContext *avctx, - const char *font, int font_size, - int color, int back_color, - int bold, int italic, int underline, - int alignment); - /** * Generate a suitable AVCodecContext.subtitle_header for SUBTITLE_ASS * with default style. -- GitLab