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

wm4 nfxjfg at googlemail.com
Mon Jul 3 15:01:37 EEST 2017


On Mon, 3 Jul 2017 13:54:50 +0200
Clément Bœsch <u at pkh.me> wrote:

> 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/>?

No idea.

> 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).

The font tag also uses strcmp(), so that's orthogonal.

> I assume you tested fate-subtitles.
> 

Yes.


More information about the ffmpeg-devel mailing list