Michael Niedermayer
5d1b39f7e7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: clean up library installation rules
vf_drawtext: Remove some write-only variables.
libgsm: Drop const qualifier to silence compiler warning.
docs: Remove needless configure options
docs: Don't recommend adding --enable-memalign-hack
libvo-amrwbenc: Add braces to shut up gcc warning.
adts: Fix PCE copying.
Conflicts:
configure
doc/general.texi
subdir.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-08 01:05:28 +02:00
Diego Biurrun
965fdda015
vf_drawtext: Remove some write-only variables.
...
libavfilter/vf_drawtext.c:427:22: warning: variable 'dst_pixel' set but not used
libavfilter/vf_drawtext.c:463:22: warning: variable 'dst_pixel' set but not used
2011-07-07 17:32:50 +02:00
Stefano Sabatini
702a62a1c6
drawtext: add braces around initialisers for option defaults
...
Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-20 20:54:40 +02:00
Stefano Sabatini
53a715f576
drawtext: reindent after the previous commit
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-20 20:54:40 +02:00
Stefano Sabatini
3fd53defaa
drawtext: fix strftime() text expansion
...
The feature was dropped after the filter was partially rewritten and
recommitted.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-06-20 20:54:40 +02:00
Mina Nagy Zaki
fd2c0a5db2
lavfi: add layout negotiation fields and helper functions.
2011-06-19 22:58:32 +02:00
Diego Biurrun
5ac4952a58
vf_drawtext: Replace FFmpeg by Libav in license boilerplate.
2011-05-31 21:15:49 +02:00
Stefano Sabatini
d8c7a21602
drawtext: specify union type for setting default options
...
Fix warnings of the type:
vf_drawtext.c:NNN: warning: missing braces around initializer
vf_drawtext.c:NNN: warning: (near initialization for ‘drawtext_options[X].default_val’)
2011-05-16 23:50:43 +02:00
Stefano Sabatini
e8ea9c2179
drawtext: reindent after the previous commit
2011-05-16 23:50:36 +02:00
Stefano Sabatini
ce207e050e
drawtext: fix strftime() text expansion
...
The feature was dropped after the filter was partially rewritten and
recommitted.
Fix issue #207 .
2011-05-16 23:50:29 +02:00
Michael Niedermayer
c5420f100f
drawtext: add shadow support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:21:56 +02:00
Michael Niedermayer
e73127a443
drawtext: factor draw_glyphs.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:21:56 +02:00
Michael Niedermayer
a5b81c317e
drawtext: fix and optimize yuv blend.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:21:53 +02:00
Michael Niedermayer
3953a88014
drawtext: get rid of divisions in the inner loop.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:18:16 +02:00
Michael Niedermayer
e74bf3f368
drawtext: simplify chroma blend and fix chroma alpha.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:18:16 +02:00
Stefano Sabatini
a5b64584f3
lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo
...
With the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats
* fix minor errors and typos in the filter description
* extend/clarify examples in the filter description
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-07 10:17:40 +02:00
