summaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_drawtext.c
Commit message (Expand)AuthorAgeFilesLines
* lavfi/vf_drawtext: default to expansion=normal.Nicolas George2013-01-261-1/+1
* lavfi/drawtext: make use of outlink variable in filter_frame()Stefano Sabatini2012-12-061-1/+1
* Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer2012-12-051-2/+0
|\
| * Remove pointless #undefs of previously forbidden functions.Anton Khirnov2012-12-041-2/+0
| * lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov2012-11-281-31/+7
* | lavfi/drawtext: add the reload option.Nicolas George2012-12-041-14/+33
* | vf_drawtext: switch to filter_frame, this filter did not support slicesMichael Niedermayer2012-11-281-17/+6
* | lavfi/drawtext: add support to expansion of generic expressionsStefano Sabatini2012-11-271-0/+22
* | lavfi/drawtext: add support for printing frame numbersStefano Sabatini2012-11-221-0/+11
* | lavfi/drawtext: implement more generic expansion.Nicolas George2012-11-181-7/+166
* | lavfi/drawtext: use bprint for the expanded text.Nicolas George2012-11-171-23/+16
* | Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'Michael Niedermayer2012-11-031-1/+1
|\ \ | |/
| * vf_drawtext: do not use deprecated av_tree_node_sizeAnton Khirnov2012-11-021-1/+1
| * lavfi: do not use av_pix_fmt_descriptors directly.Anton Khirnov2012-10-121-1/+1
* | drawtext: fix leak with timecodesMichael Niedermayer2012-10-111-0/+1
* | Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-111-13/+25
|\ \ | |/
| * lavfi: convert input/ouput list compound literals to named objectsMans Rullgard2012-10-101-14/+26
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-081-8/+8
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-7/+7
|\ \ | |/
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-6/+6
* | Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'Michael Niedermayer2012-09-051-1/+1
|\ \ | |/
| * avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union memberMartin Storsjö2012-09-041-1/+1
* | Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-051-15/+15
|\ \ | |/
| * avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union memberMartin Storsjö2012-09-041-15/+15
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-241-1/+1
|\ \ | |/
* | lavfi: add priv class to filter definitions and flags to filter internal optionsStefano Sabatini2012-08-181-38/+39
* | vf_drawtext: fix permissions.Nicolas George2012-08-171-2/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+1
|\ \ | |/
| * Add more missing includes after removing the implicit common.hMartin Storsjö2012-08-161-0/+1
* | Remove "Error parsing options string [...]" messages.Clément Bœsch2012-08-091-3/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-221-4/+10
|\ \ | |/
| * lavfi: add error handling to end_frame().Anton Khirnov2012-07-221-3/+6
| * lavfi: add error handling to draw_slice().Anton Khirnov2012-07-221-1/+4
| * lavfi: add error handling to start_frame().Anton Khirnov2012-07-221-7/+9
* | Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'Michael Niedermayer2012-07-221-14/+14
|\ \ | |/
| * lavfi: use const for AVFilterPad declarations in all filters.Ronald S. Bultje2012-07-211-14/+14
| * lavfi: unref AVFilterLink.cur_buf in ff_end_frame().Anton Khirnov2012-07-201-1/+0
| * vf_drawtext: don't give up its own reference to the input buffer.Anton Khirnov2012-07-201-1/+4
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-261-2/+2
|\ \ | |/
| * lavfi: remove 'opaque' parameter from AVFilter.init()Anton Khirnov2012-06-261-1/+1
* | lavfi/drawtext: use av_opt_free() to free private contextStefano Sabatini2012-06-251-10/+1
* | lavfi: define macro AVFILTER_DEFINE_CLASSStefano Sabatini2012-06-221-7/+1
* | lavfi/drawtext: remove unnecessary parentheses in init()Stefano Sabatini2012-06-221-1/+1
* | lavfi: use designated initializers for AVClassPaul B Mahol2012-06-171-3/+5
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-131-0/+1
|\ \ | |/
| * lavfi: make AVFilterPad opaque after two major bumps.Anton Khirnov2012-06-131-0/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-061-3/+4
|\ \ | |/
| * lavfi: remove request/poll and drawing functions from public API on next bumpAnton Khirnov2012-06-051-3/+3
| * lavfi: make formats API private on next bump.Anton Khirnov2012-06-051-1/+2
* | lavfi: use av_default_item_name() as filter private context loggerStefano Sabatini2012-06-041-1/+1
OpenPOWER on IntegriCloud