On Sat, 12 Apr 2014 16:02:50 +0200, Luca Barbato <[email protected]> wrote:
> Introduce the `font` option and make it optional to pass a fontfile.
> ---
>
> Rebased to the new documentation, leak plugged and made the failures
> more expressive.
>
Except for the documentation nit looks fine, assuming it's tested and works.
> configure | 2 +
> doc/filters.texi | 7 +++-
> libavfilter/vf_drawtext.c | 98
> +++++++++++++++++++++++++++++++++++++++++++++--
> 3 files changed, 102 insertions(+), 5 deletions(-)
>
> diff --git a/configure b/configure
> index 3c49d9c..63a9e72 100755
> --- a/configure
> +++ b/configure
> @@ -1128,6 +1128,7 @@ EXTERNAL_LIBRARY_LIST="
> libdc1394
> libfaac
> libfdk_aac
> + libfontconfig
> libfreetype
> libgsm
> libilbc
> @@ -4024,6 +4025,7 @@ enabled frei0r && { check_header frei0r.h ||
> die "ERROR: frei0r.h hea
> enabled gnutls && require_pkg_config gnutls gnutls/gnutls.h
> gnutls_global_init
> enabled libfaac && require2 libfaac "stdint.h faac.h"
> faacEncGetVersion -lfaac
> enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h
> aacEncOpen -lfdk-aac
> +enabled libfontconfig && require_pkg_config fontconfig
> "fontconfig/fontconfig.h" FcInit
> enabled libfreetype && require_pkg_config freetype2 "ft2build.h
> FT_FREETYPE_H" FT_Init_FreeType
> enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
> check_lib "${gsm_hdr}" gsm_create -lgsm
> && break;
> diff --git a/doc/filters.texi b/doc/filters.texi
> index 2798881..d8b3ef1 100644
> --- a/doc/filters.texi
> +++ b/doc/filters.texi
> @@ -1110,6 +1110,8 @@ libfreetype library.
>
> To enable compilation of this filter, you need to configure Libav with
> @code{--enable-libfreetype}.
> +To enable default font fallback and the @var{font} option you need to
> +configure Libav with @code{--enable-libfontconfig}.
>
> The filter also recognizes strftime() sequences in the provided text
> and expands them accordingly. Check the documentation of strftime().
> @@ -1118,9 +1120,12 @@ It accepts the following parameters:
>
> @table @option
>
> +@item font
> +The font to be used for drawing text. By default Sans.
nit: "the font" is unclear
it's "font name" or "font family" or "font pattern" or something, but not just
"font"
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
