You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-06-14 08:44:40 +02:00
avfilter/vf_drawtext: always check pixel_mode == FT_PIXEL_MODE_MONO
The code as written can add such glyphs in the cache so we need to check glyphs from the cache too. This should be the most robust and simple solution Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
committed by
michaelni
parent
c65c8f1f49
commit
c8c4e2d2a5
@@ -795,11 +795,11 @@ static int load_glyph(AVFilterContext *ctx, Glyph **glyph_ptr, uint32_t code, in
|
||||
goto error;
|
||||
}
|
||||
glyph->bglyph[idx] = (FT_BitmapGlyph)tmp_glyph;
|
||||
if (glyph->bglyph[idx]->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Monocromatic (1bpp) fonts are not supported.\n");
|
||||
ret = AVERROR(EINVAL);
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
if (glyph->bglyph[idx]->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Monocromatic (1bpp) fonts are not supported.\n");
|
||||
ret = AVERROR(EINVAL);
|
||||
goto error;
|
||||
}
|
||||
if (s->borderw && !glyph->border_bglyph[idx]) {
|
||||
FT_Glyph tmp_glyph = glyph->border_glyph;
|
||||
|
||||
Reference in New Issue
Block a user