aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-01-25 02:59:31 +0100
committerJanne Grunau <janne-ffmpeg@jannau.net>2011-01-25 22:05:12 +0100
commitcf1d794a490444e710dc16606fa57c0db96d5f25 (patch)
tree85c8bbec447907b149f2c099ca41209c5ed92b4d
parentd625a32d6ba0405e6da061991dfd90f6da2a3b7a (diff)
downloadffmpeg-cf1d794a490444e710dc16606fa57c0db96d5f25.tar.gz
Make ff_ass_subtitle_header static to ass.c
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
-rw-r--r--libavcodec/ass.c25
-rw-r--r--libavcodec/ass.h21
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
@@ -40,27 +40,6 @@
/** @} */
/**
- * 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.
*