diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:23:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:24:11 +0100 |
| commit | 37e81996dcf3452c48dd134877bf10b5060dacb3 (patch) | |
| tree | 46c9098620c5d3a73823b283e747eb23d95b8606 /libavfilter | |
| parent | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (diff) | |
| parent | 9221efef7968463f3e3d9ce79ea72eaca082e73f (diff) | |
| download | ffmpeg-37e81996dcf3452c48dd134877bf10b5060dacb3.tar.gz | |
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_drawtext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 7b672712dc..849bf1344e 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -277,7 +277,7 @@ static int load_glyph(AVFilterContext *ctx, Glyph **glyph_ptr, uint32_t code) FT_Glyph_Get_CBox(*glyph->glyph, ft_glyph_bbox_pixels, &glyph->bbox); /* cache the newly created glyph */ - if (!(node = av_mallocz(av_tree_node_size))) { + if (!(node = av_tree_node_alloc())) { ret = AVERROR(ENOMEM); goto error; } |