[FFmpeg-cvslog] avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 27 17:43:03 2014 +0200| [0d26264fb4c8fbf3f26692270e77f71633d4b103] | committer: Michael Niedermayer

avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d26264fb4c8fbf3f26692270e77f71633d4b103
---

 libavfilter/drawutils.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c
index a5064f8..4437c2c 100644
--- a/libavfilter/drawutils.c
+++ b/libavfilter/drawutils.c
@@ -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;