summaryrefslogtreecommitdiff
path: root/libavfilter/vf_drawtext.c
Commit message (Collapse)AuthorAge
* avfilter/vf_drawtext: use gm_time_r() for thread safteyMichael Niedermayer2014-11-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'Michael Niedermayer2014-10-26
|\ | | | | | | | | | | | | | | | | | | * commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6': drawtext: Remove the ifdef for localtime_r Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * drawtext: Remove the ifdef for localtime_rMartin Storsjö2014-10-26
| | | | | | | | | | | | | | | | 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>
* | Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f401792595dd7760f531e8a3bd2336e9033bd45a': vf_drawtext: Do not leak the mmapped textfile Conflicts: libavfilter/vf_drawtext.c See: 6956b048d8198dce5126c8942dece21cfb1a7978 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: Do not leak the mmapped textfileLuca Barbato2014-10-18
| | | | | | | | | | | | | | And validate its size while at it. CC: libav-stable@libav.org Bug-Id: CID 1244189
* | avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruftJames Almer2014-10-12
| |
* | vf_drawtext: add missing clear of pointers after av_expr_free()Karl Kiniger2014-10-11
| | | | | | | | | | | | | | | | | | | | 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>
* | vf_drawtext: move "static const" before "struct".Reimar Döffinger2014-08-31
| | | | | | | | | | | | This is consistent with all other occurrences. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add missing "const" all over the place.Reimar Döffinger2014-08-29
| | | | | | | | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"Andrey Utkin2014-07-18
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/drawtext: add fontcolor_expr optionAndrey Utkin2014-07-17
| | | | | | | | | | | | Allow to dynamically evaluate the font color. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavfi/drawtext: add expansion function eif()Andrey Utkin2014-07-17
| | | | | | | | | | | | | | | | | | It evaluates expression and outputs it as integer value, using specified format. Address trac ticket #3699. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avfilter/drawtext: Add basic text shaping using libfribidiMarc Jeffreys2014-07-16
| | | | | | | | | | | | | | Fixes ticket #3758 Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer2014-07-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structureStefano Sabatini2014-07-05
| | | | | | | | Slightly simplify.
* | avfilter/vf_drawtext: fix resource leakLeandro Santiago2014-07-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | drawtext: drop unused draw_glyphs() arg "rgbcolor"Andrey Utkin2014-06-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.Nicolas George2014-04-29
| |
* | avfilter/vf_drawtext: fix resource leaksMichael Niedermayer2014-04-27
| | | | | | | | | | | | Fixes CID1206649 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'Michael Niedermayer2014-04-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: name anonymous structsVittorio Giovara2014-04-19
| |
* | Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'Michael Niedermayer2014-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432': drawtext: Add fontconfig support Conflicts: configure doc/filters.texi libavfilter/vf_drawtext.c See: 40b7a27bad8b8b35cb215bf4f4cba02a00d6f9e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * drawtext: Add fontconfig supportLuca Barbato2014-04-17
| | | | | | | | | | | | Introduce the `font` option and make it optional to pass a fontfile. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * drawtext: Drop pointless headerLuca Barbato2014-01-06
| | | | | | | | It should be forward compatible with newer freetype.
* | Fix compilation with msvc/icl due to missing header and define.Matt Oliver2014-02-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/drawtext: fix reinit commandAndrey Utkin2014-02-02
| | | | | | | | | | | | | | Problem was that reinit argument wasn't used. Regression came in at commit fd6228e65711e63a9e35e9a1087d7ce62040e6e3 Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavfi/drawtext: add option for drawing border around textRamiro Polla2014-01-25
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/drawtext: get bitmap from glyph in a separate stepRamiro Polla2014-01-25
| | | | | | | | | | | | | | | | 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>
* | configure: Special case libfreetype testAlexander Strasser2013-12-08
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavfi: do not export the filters from shared objectsAnton Khirnov2013-10-28
| |
* | avfilter/vf_drawtext: remove dead initializationPaul B Mahol2013-10-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: various cosmeticsPaul B Mahol2013-09-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: remove redundant .get_(audio/video)_buffer initializationsPaul B Mahol2013-09-07
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavfi/drawtext: add generic timeline interface and deprecate "draw".Clément Bœsch2013-09-03
| |
* | lavfi/drawtext: add support for printing frame metadataPaul B Mahol2013-07-09
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | add the start_number offset to var_values[VAR_N] directly, instead of adding ↵Mark Visser2013-06-18
| | | | | | | | it in func_frame_num
* | added start_number parameter to drawtext to permit an offset to n/frame_num varMark Visser2013-06-14
| |
* | avfilter/vf_drawtext: Fix doxygen commentMichael Niedermayer2013-05-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/drawtext: switch to AV_OPT_TYPE_COLORPaul B Mahol2013-05-17
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '3fb29588a27a711132106b924e27b53789a58dcb'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fb29588a27a711132106b924e27b53789a58dcb': vf_drawtext: don't leak the expressions. vf_crop: make config_props work properly when called multiple times. vf_setdar: make config_props work properly when called multiple times. Conflicts: libavfilter/vf_aspect.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: don't leak the expressions.Anton Khirnov2013-05-17
| |
* | Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'Michael Niedermayer2013-05-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c205f42c86ccefa093c59434669af34ad14a52b': vf_drawbox: make config_props work properly when called multiple times. vf_drawtext: do not reset the frame number in config_input. vf_fps: move initializing pts from config_props to init. Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: do not reset the frame number in config_input.Anton Khirnov2013-05-17
| | | | | | | | | | Frame number should be incremented normally even if the link properties change.
* | Merge commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68'Michael Niedermayer2013-05-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0279956b3ca3e5fd0a6a25253893d6f07000e68': vf_fade: use the name 's' for the pointer to the private context vf_drawtext: use the name 's' for the pointer to the private context vf_drawbox: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_drawtext: use the name 's' for the pointer to the private contextAnton Khirnov2013-05-16
| | | | | | | | This is shorter and consistent across filters.
| * lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov2013-04-09
| |
* | avfilter/drawtext: add pict_type supportMichael Niedermayer2013-04-23
| | | | | | | | | | | | Fixes Ticket2470 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: add frame counter into AVFilterLink and use it in filters.Clément Bœsch2013-04-23
| |
* | lavfi/drawtext: make options array more readable.Clément Bœsch2013-04-15
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 11:23:11 +0000