Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavfilter/vf_drawtext.c
AgeCommit message (Collapse)Author
2016-09-21avfilter/drawutils: allow drawing opaque text on transparent backgroundPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-24avfilter/vf_drawtext: Check return code of load_glyph()Michael Niedermayer
Fixes segfault Fixes Ticket5347 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-13avfilter/vf_drawtext: add optional default value to metadata functionTobias Rapp
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2016-01-04lavfi/drawtext: Fix microsecond display.Carl Eugen Hoyos
Fixes ticket #4792.
2015-12-21lavfi/vf_drawtext: replace round by llrintGanesh Ajjanagadde
llrint is at least as fast, and avoids an implicit cast. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-12-21lavfi/drawtext: fix shadow[xy] descriptionsClément Bœsch
2015-12-21lavfi/drawtext: hide first font load warning when fontconfig is presentClément Bœsch
2015-12-21lavfi/drawtext: fix crash when no text, file or timecode providedClément Bœsch
2015-10-25avutil/tree: add additional const qualifier to the comparatorGanesh Ajjanagadde
libc's qsort comparator has a const qualifier on both arguments. This adds a missing const qualifier to exactly match the comparator API. Existing usages of av_tree_find, av_tree_insert are appropriately modified: type signature changes of the comparators, and removal of unnecessary void * casts of function pointers. Reviewed-by: Henrik Gramner <henrik@gramner.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-24all: remove some casts of function pointer to void *Ganesh Ajjanagadde
These casts are unnecessary, and may safely be removed. Found by enabling -Wpedantic on clang 3.7. Tested with FATE. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-12avfilter/drawtext: allow to format pts with strftimeAlex Agranovsky
Signed-off-by: Alex Agranovsky <alex@sighthound.com>
2015-09-09avfilter/drawtext: use AV_OPT_TYPE_BOOL for a few optionsClément Bœsch
2015-04-21Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'Michael Niedermayer
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386': drawtext: Add an alpha option Conflicts: doc/filters.texi libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-21drawtext: Add an alpha optionLuca Barbato
And document both `draw` and `alpha`. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-19Replace av_dlog with normal av_log at trace levelVittorio Giovara
This applies to every library where performance is not critical.
2015-04-14avfilter/drawtext: fix frame mem leakIvan Efimov
Signed-off-by: Ivan Efimov <ioefimov@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-08avfilter: handle error in query_formats() in bunch of filtersPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-03-31vf_drawtext: add support for setting box border widthMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08avfilter/vf_drawtext: Change enums to int, which are accessed via AVOption ↵Michael Niedermayer
as int This fixes depending on implementation defined behavior
2014-12-07lavfi: Increase drawtext font size limitsМихаил Муковников
Raise the maximum font size to a larger value. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-11-02avfilter/vf_drawtext: use gm_time_r() for thread safteyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'Michael Niedermayer
* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6': drawtext: Remove the ifdef for localtime_r Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26drawtext: Remove the ifdef for localtime_rMartin Storsjö
If it isn't available in the system, we've got a fallback to the normal localtime function, so normal code can assume it is available as long as time_internal.h is included. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-18Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'Michael Niedermayer
* commit 'f401792595dd7760f531e8a3bd2336e9033bd45a': vf_drawtext: Do not leak the mmapped textfile Conflicts: libavfilter/vf_drawtext.c See: 6956b048d8198dce5126c8942dece21cfb1a7978 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18vf_drawtext: Do not leak the mmapped textfileLuca Barbato
And validate its size while at it. CC: libav-stable@libav.org Bug-Id: CID 1244189
2014-10-12avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruftJames Almer
2014-10-12vf_drawtext: add missing clear of pointers after av_expr_free()Karl Kiniger
Fixes segfault when using sendcmd with drawtext. Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE evaluates to 0. Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-31vf_drawtext: move "static const" before "struct".Reimar Döffinger
This is consistent with all other occurrences. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29Add missing "const" all over the place.Reimar Döffinger
Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-07-18lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"Andrey Utkin
Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17lavfi/drawtext: add fontcolor_expr optionAndrey Utkin
Allow to dynamically evaluate the font color. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-07-17lavfi/drawtext: add expansion function eif()Andrey Utkin
It evaluates expression and outputs it as integer value, using specified format. Address trac ticket #3699. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-07-16avfilter/drawtext: Add basic text shaping using libfribidiMarc Jeffreys
Fixes ticket #3758 Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-05lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structureStefano Sabatini
Slightly simplify.
2014-07-03avfilter/vf_drawtext: fix resource leakLeandro Santiago
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22drawtext: drop unused draw_glyphs() arg "rgbcolor"Andrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.Nicolas George
2014-04-27avfilter/vf_drawtext: fix resource leaksMichael Niedermayer
Fixes CID1206649 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'Michael Niedermayer
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b': lavfi: name anonymous structs Conflicts: libavfilter/buffersink.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_showinfo.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19lavfi: name anonymous structsVittorio Giovara
2014-04-17Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'Michael Niedermayer
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432': drawtext: Add fontconfig support Conflicts: configure doc/filters.texi libavfilter/vf_drawtext.c See: 40b7a27bad8b8b35cb215bf4f4cba02a00d6f9e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-17drawtext: Add fontconfig supportLuca Barbato
Introduce the `font` option and make it optional to pass a fontfile. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-02-03Fix compilation with msvc/icl due to missing header and define.Matt Oliver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-02lavfi/drawtext: fix reinit commandAndrey Utkin
Problem was that reinit argument wasn't used. Regression came in at commit fd6228e65711e63a9e35e9a1087d7ce62040e6e3 Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-01-25lavfi/drawtext: add option for drawing border around textRamiro Polla
Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25lavfi/drawtext: get bitmap from glyph in a separate stepRamiro Polla
This change makes it possible to transform the glyph or get its border before turning it into a bitmap. Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06drawtext: Drop pointless headerLuca Barbato
It should be forward compatible with newer freetype.
2013-12-08configure: Special case libfreetype testAlexander Strasser
Include the freetype header, in-directly through a macro, like it is done in the drawtext filter. Do not break if the header is moved. Unfortunately the drawtext filter included the file where the include macros are defined in a wrong way. This is not needed and breaks the build. Remove that #include line too. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavfi: do not export the filters from shared objects Conflicts: libavfilter/af_amix.c libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_select.c libavfilter/f_settb.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_colorbalance.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_drawbox.c libavfilter/vf_format.c libavfilter/vf_framestep.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 23:42:15 +0300