diff options
| author | Clément Bœsch <u@pkh.me> | 2015-09-06 13:39:04 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2015-09-06 13:39:04 +0200 |
| commit | 26786f43d7d58e82f0d7003837d6893f3180b81a (patch) | |
| tree | 82c1176a4be0358dd10055b24d8fa862d5683a12 | |
| parent | 87f90be4f2a6c68f334cfc89493b0e410eb2afde (diff) | |
| download | ffmpeg-26786f43d7d58e82f0d7003837d6893f3180b81a.tar.gz | |
avcodec/htmlsubtitles: drop avcodec dependency
| -rw-r--r-- | libavcodec/htmlsubtitles.c | 9 | ||||
| -rw-r--r-- | libavcodec/htmlsubtitles.h | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c index 97be82daa0..94dc252817 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 b06a5af6c8..e10cdda241 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 */ |