7c8fcbbde3
avutil/tree: add additional const qualifier to the comparator
...
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-24 20:38:07 -04:00
4c96985af1
all: remove some casts of function pointer to void *
...
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-24 15:14:59 -04:00
cf28490e56
avfilter/drawtext: allow to format pts with strftime
...
Signed-off-by: Alex Agranovsky <alex@sighthound.com>
2015-10-12 16:56:58 +02:00
1cab6a33cd
avfilter/drawtext: use AV_OPT_TYPE_BOOL for a few options
2015-09-08 23:56:43 +02:00
122150168f
Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
...
* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
drawtext: Add an alpha option
Conflicts:
doc/filters.texi
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-21 20:20:58 +02:00
9b2c57bef5
drawtext: Add an alpha option
...
And document both `draw` and `alpha`.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-21 11:13:30 +02:00
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
2051b401cc
avfilter/drawtext: fix frame mem leak
...
Signed-off-by: Ivan Efimov <ioefimov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14 12:04:52 +02:00
a0854c084e
avfilter: handle error in query_formats() in bunch of filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-08 13:05:06 +00:00
c84b75c89c
vf_drawtext: add support for setting box border width
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31 13:41:25 +02:00
ee7b5d4ef8
avfilter/vf_drawtext: Change enums to int, which are accessed via AVOption as int
...
This fixes depending on implementation defined behavior
2015-03-08 21:10:31 +01:00
71f29410e7
lavfi: Increase drawtext font size limits
...
Raise the maximum font size to a larger value.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-12-07 13:15:03 +01:00
013c3eb05c
avfilter/vf_drawtext: use gm_time_r() for thread saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-02 19:20:26 +01:00
4360c6ff61
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
...
* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
drawtext: Remove the ifdef for localtime_r
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26 03:12:37 +01:00
6b9b42cc55
drawtext: Remove the ifdef for localtime_r
...
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-26 00:14:54 +03:00
0b2f860db5
Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'
...
* commit 'f401792595dd7760f531e8a3bd2336e9033bd45a':
vf_drawtext: Do not leak the mmapped textfile
Conflicts:
libavfilter/vf_drawtext.c
See: 6956b048d8
2014-10-18 21:33:04 +02:00
f401792595
vf_drawtext: Do not leak the mmapped textfile
...
And validate its size while at it.
CC: libav-stable@libav.org
Bug-Id: CID 1244189
2014-10-18 16:15:09 +01:00
59d8050df1
avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruft
2014-10-12 15:54:58 -03:00
903156aa8a
vf_drawtext: add missing clear of pointers after av_expr_free()
...
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-10-11 23:16:31 +02:00
6d7aa437e1
vf_drawtext: move "static const" before "struct".
...
This is consistent with all other occurrences.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-31 10:41:42 +02:00
d9e2aceb7f
Add missing "const" all over the place.
...
Only "./configure --enable-gpl" on x86 was tested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29 18:57:25 +02:00
cb8cb85da7
lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18 14:24:34 +02:00
e9ff5df0b5
lavfi/drawtext: add fontcolor_expr option
...
Allow to dynamically evaluate the font color.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-07-17 12:42:56 +02:00
dec87454de
lavfi/drawtext: add expansion function eif()
...
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-17 11:29:43 +02:00
a0b71e9f3e
avfilter/drawtext: Add basic text shaping using libfribidi
...
Fixes ticket #3758
Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 00:40:39 +02:00
576ced5530
avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 02:49:13 +02:00
85eabd748b
lavfi/drawtext: do not allocate FT_Glyph, but keep it in the Glyph structure
...
Slightly simplify.
2014-07-05 11:48:06 +02:00
4582e1162a
avfilter/vf_drawtext: fix resource leak
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 15:45:15 +02:00
3bb4d26a5d
drawtext: drop unused draw_glyphs() arg "rgbcolor"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22 19:52:44 +02:00
41334fcab4
lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
2014-04-29 13:25:59 +02:00
6956b048d8
avfilter/vf_drawtext: fix resource leaks
...
Fixes CID1206649
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27 03:18:57 +02:00
74a8dbe1c4
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
...
* 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-19 18:20:17 +02:00
58400ac133
lavfi: name anonymous structs
2014-04-19 16:20:57 +02:00
443261cbbd
Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'
...
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
drawtext: Add fontconfig support
Conflicts:
configure
doc/filters.texi
libavfilter/vf_drawtext.c
See: 40b7a27bad
2014-04-17 05:15:26 +02:00
f1b239ec8b
drawtext: Add fontconfig support
...
Introduce the `font` option and make it optional to pass a fontfile.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-17 00:41:30 +02:00
3e309c5d18
Fix compilation with msvc/icl due to missing header and define.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-03 19:48:41 +01:00
6d7119dbd2
lavfi/drawtext: fix reinit command
...
Problem was that reinit argument wasn't used.
Regression came in at commit fd6228e657
2014-02-02 16:21:50 +01:00
78a9f185eb
lavfi/drawtext: add option for drawing border around text
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 04:59:28 +01:00
222fb8276d
lavfi/drawtext: get bitmap from glyph in a separate step
...
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-25 04:46:38 +01:00
d68dc3c944
drawtext: Drop pointless header
...
It should be forward compatible with newer freetype.
2014-01-06 11:44:10 +01:00
cea5812fa7
configure: Special case libfreetype test
...
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-12-08 18:21:46 +01:00
325f6e0a97
Merge remote-tracking branch 'qatar/master'
...
* 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>
2013-10-29 11:58:11 +01:00
cd43ca0443
lavfi: do not export the filters from shared objects
2013-10-28 15:29:54 +01:00
ad934bc353
avfilter/vf_drawtext: remove dead initialization
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-07 08:40:17 +00:00
b211607b5c
avfilter: various cosmetics
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-12 14:01:43 +00:00
b077d8d908
avfilter: remove redundant .get_(audio/video)_buffer initializations
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-07 18:20:16 +00:00
30d40c9e86
lavfi/drawtext: add generic timeline interface and deprecate "draw".
2013-09-03 21:12:15 +02:00
c5a1b18f18
lavfi/drawtext: add support for printing frame metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-09 15:21:01 +00:00
2090abcc43
add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num
2013-06-18 17:38:17 -04:00
0defc77e9d
added start_number parameter to drawtext to permit an offset to n/frame_num var
2013-06-14 17:05:19 -04:00
Ganesh Ajjanagadde
Alex Agranovsky
Clément Bœsch
Michael Niedermayer
Luca Barbato
Vittorio Giovara
Ivan Efimov
Paul B Mahol
Marton Balint
Михаил Муковников
Martin Storsjö
James Almer
Karl Kiniger
Reimar Döffinger
Andrey Utkin
Marc Jeffreys
Stefano Sabatini
Leandro Santiago
Nicolas George
Matt Oliver
Ramiro Polla
Alexander Strasser
Anton Khirnov
Mark Visser