On 1 September 2015 at 22:44, wm4 <nfx...@googlemail.com> wrote:
> On Tue, 1 Sep 2015 23:20:27 +0200
> Michael Niedermayer <michae...@gmx.at> wrote:
>
> > On Mon, Aug 31, 2015 at 12:41:24AM +0100, Ricardo wrote:
> > > This is mostly useful if libass was compiled with a font provider
> > > other than fontconfig, but is still useful in that case.
> > >
> > > Signed-off-by: Ricardo Constantino <wiia...@gmail.com>
> > > ---
> > > doc/filters.texi | 4 ++++
> > > libavfilter/vf_subtitles.c | 4 ++++
> > > 2 files changed, 8 insertions(+)
> > >
> > > diff --git a/doc/filters.texi b/doc/filters.texi
> > > index b78cf90..d2c8842 100644
> > > --- a/doc/filters.texi
> > > +++ b/doc/filters.texi
> > > @@ -9939,6 +9939,10 @@ was composed. For the syntax of this option,
> check
> > > the
> >
> > this patch is corrupted by extra linebreaks
> >
> > please resubmit as an attachment
> >
> > [...]
>
> Apart from that, LGTM.
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
From 6ec0579691a4cad820c384effbc65f47499f046b Mon Sep 17 00:00:00 2001
From: Ricardo Constantino <wiia...@gmail.com>
Date: Sun, 30 Aug 2015 23:52:10 +0100
Subject: [PATCH] avfilter/vf_subtitles: allow setting fonts directory
This is mostly useful if libass was compiled with a font provider
other than fontconfig, but is still useful in that case.
Signed-off-by: Ricardo Constantino <wiia...@gmail.com>
---
doc/filters.texi | 4 ++++
libavfilter/vf_subtitles.c | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/doc/filters.texi b/doc/filters.texi
index b78cf90..d2c8842 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -9939,6 +9939,10 @@ was composed. For the syntax of this option, check the
Due to a misdesign in ASS aspect ratio arithmetic, this is necessary to
correctly scale the fonts if the aspect ratio has been changed.
+@item fontsdir
+Set a directory path containing fonts that can be used by the filter.
+These fonts will be used in addition to whatever the font provider uses.
+
@item charenc
Set subtitles input character encoding. @code{subtitles} filter only. Only
useful if not UTF-8.
diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c
index 5e1324c..b0d016c 100644
--- a/libavfilter/vf_subtitles.c
+++ b/libavfilter/vf_subtitles.c
@@ -50,6 +50,7 @@ typedef struct {
ASS_Renderer *renderer;
ASS_Track *track;
char *filename;
+ char *fontsdir;
char *charenc;
char *force_style;
int stream_index;
@@ -67,6 +68,7 @@ typedef struct {
{"filename", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
{"f", "set the filename of file to read", OFFSET(filename), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
{"original_size", "set the size of the original video (used to scale fonts)", OFFSET(original_w), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
+ {"fontsdir", "set the directory containing the fonts to read", OFFSET(fontsdir), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, FLAGS }, \
/* libass supports a log level ranging from 0 to 7 */
static const int ass_libavfilter_log_level_map[] = {
@@ -106,6 +108,8 @@ static av_cold int init(AVFilterContext *ctx)
}
ass_set_message_cb(ass->library, ass_log, ctx);
+ ass_set_fonts_dir(ass->library, ass->fontsdir);
+
ass->renderer = ass_renderer_init(ass->library);
if (!ass->renderer) {
av_log(ctx, AV_LOG_ERROR, "Could not initialize libass renderer.\n");
--
2.5.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
