avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-27 17:43:03 +02:00
parent ee0c91cc65
commit 0d26264fb4
1 changed files with 6 additions and 7 deletions

View File

@ -517,15 +517,14 @@ int ff_draw_round_to_sub(FFDrawContext *draw, int sub_dir, int round_dir,
AVFilterFormats *ff_draw_supported_pixel_formats(unsigned flags)
{
enum AVPixelFormat i, pix_fmts[AV_PIX_FMT_NB + 1];
unsigned n = 0;
enum AVPixelFormat i;
FFDrawContext draw;
AVFilterFormats *fmts = NULL;
for (i = 0; i < AV_PIX_FMT_NB; i++)
for (i = 0; av_pix_fmt_desc_get(i); i++)
if (ff_draw_init(&draw, i, flags) >= 0)
pix_fmts[n++] = i;
pix_fmts[n++] = AV_PIX_FMT_NONE;
return ff_make_format_list(pix_fmts);
ff_add_format(&fmts, i);
return fmts;
}
#ifdef TEST
@ -540,7 +539,7 @@ int main(void)
FFDrawColor color;
int r, i;
for (f = 0; f < AV_PIX_FMT_NB; f++) {
for (f = 0; av_pix_fmt_desc_get(f); f++) {
desc = av_pix_fmt_desc_get(f);
if (!desc->name)
continue;