[FFmpeg-cvslog] avcodec/htmlsubtitles: drop avcodec dependency

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Sep  6 13:39:04 2015 +0200| [26786f43d7d58e82f0d7003837d6893f3180b81a] | committer: Clément Bœsch

avcodec/htmlsubtitles: drop avcodec dependency

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26786f43d7d58e82f0d7003837d6893f3180b81a
---

 libavcodec/htmlsubtitles.c |    9 ++++-----
 libavcodec/htmlsubtitles.h |    3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c
index 97be82d..94dc252 100644
--- a/libavcodec/htmlsubtitles.c
+++ b/libavcodec/htmlsubtitles.c
@@ -21,13 +21,12 @@
 #include "libavutil/avstring.h"
 #include "libavutil/common.h"
 #include "libavutil/parseutils.h"
-#include "avcodec.h"
 #include "htmlsubtitles.h"
 
-static int html_color_parse(AVCodecContext *avctx, const char *str)
+static int html_color_parse(void *log_ctx, const char *str)
 {
     uint8_t rgba[4];
-    if (av_parse_color(rgba, str, strcspn(str, "\" >"), avctx) < 0)
+    if (av_parse_color(rgba, str, strcspn(str, "\" >"), log_ctx) < 0)
         return -1;
     return rgba[0] | rgba[1] << 8 | rgba[2] << 16;
 }
@@ -51,7 +50,7 @@ static void rstrip_spaces_buf(AVBPrint *buf)
         buf->str[--buf->len] = 0;
 }
 
-void ff_htmlmarkup_to_ass(AVCodecContext *avctx, AVBPrint *dst, const char *in)
+void ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
 {
     char *param, buffer[128], tmp[128];
     int len, tag_close, sptr = 1, line_start = 1, an = 0, end = 0;
@@ -125,7 +124,7 @@ void ff_htmlmarkup_to_ass(AVCodecContext *avctx, AVBPrint *dst, const char *in)
                                     snprintf(stack[sptr].param[PARAM_COLOR],
                                          sizeof(stack[0].param[PARAM_COLOR]),
                                          "{\\c&H%X&}",
-                                         html_color_parse(avctx, param));
+                                         html_color_parse(log_ctx, param));
                                 } else if (!strncmp(param, "face=", 5)) {
                                     param += 5 + (param[5] == '"');
                                     len = strcspn(param,
diff --git a/libavcodec/htmlsubtitles.h b/libavcodec/htmlsubtitles.h
index b06a5af..e10cdda 100644
--- a/libavcodec/htmlsubtitles.h
+++ b/libavcodec/htmlsubtitles.h
@@ -23,7 +23,6 @@
 
 #include "libavutil/bprint.h"
 
-void ff_htmlmarkup_to_ass(AVCodecContext *avctx, AVBPrint *dst, const char *in);
-
+void ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in);
 
 #endif /* AVCODEC_HTMLSUBTITLES_H */