[FFmpeg-devel] [PATCH] htmlsubtitles: support <br> tag

Clément Bœsch u at pkh.me
Mon Jul 3 14:54:50 EEST 2017


On Mon, Jul 03, 2017 at 01:43:43PM +0200, wm4 wrote:
> Some .srt files use this tag.
> 
> (An alternative implementation would be correctly ignoring unknown tags,
> and treating them as whitespace. libass can do automatic line wrapping.)
> ---
>  libavcodec/htmlsubtitles.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/libavcodec/htmlsubtitles.c b/libavcodec/htmlsubtitles.c
> index be5c9316ca..fe991678d5 100644
> --- a/libavcodec/htmlsubtitles.c
> +++ b/libavcodec/htmlsubtitles.c
> @@ -167,6 +167,8 @@ int ff_htmlmarkup_to_ass(void *log_ctx, AVBPrint *dst, const char *in)
>                          }
>                      } else if (tagname[0] && !tagname[1] && strspn(tagname, "bisu") == 1) {
>                          av_bprintf(dst, "{\\%c%d}", tagname[0], !tag_close);
> +                    } else if (!strcmp(tagname, "br")) {
> +                        av_bprintf(dst, "\\N");
>                      } else {
>                          unknown = 1;
>                          snprintf(tmp, sizeof(tmp), "</%s>", tagname);

So this supports <br>, <   br > and <br/>?

Which makes me think we should use (av_)strcasecmp instead. I think there
is a patch for this on the ml (which you may want to apply before this
one).

I assume you tested fate-subtitles.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20170703/a4ba1f23/attachment.sig>


More information about the ffmpeg-devel mailing list