lavd: do not use av_pix_fmt_descriptors directly

Signed-off-by: Paul B Mahol <onemda@gmail.com>

diff --git a/libavdevice/caca.c b/libavdevice/caca.c
index 6cd0306d1836e77f1048d21f5ad317c9d765e0cb..dd20ba3636a0b73d678fcba9322d7f1982e0e5b4 100644 (file)
--- a/libavdevice/caca.c
+++ b/libavdevice/caca.c
@@ -140,7 +140,7 @@ static int caca_write_header(AVFormatContext *s)
         goto fail;
     }
 
-    bpp = av_get_bits_per_pixel(&av_pix_fmt_descriptors[encctx->pix_fmt]);
+    bpp = av_get_bits_per_pixel(av_pix_fmt_desc_get(avctx->pix_fmt));
     c->dither = caca_create_dither(bpp, encctx->width, encctx->height,
                                    bpp / 8 * encctx->width,
                                    0x0000ff, 0x00ff00, 0xff0000, 0);

diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index 860c055a05acfd08f1865b9c5b4d0668d2c4db6c..944794fb87451261998337e068edc54d777915a5 100644 (file)
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -54,14 +54,17 @@ static int *create_all_formats(int n)
 {
     int i, j, *fmts, count = 0;
 
-    for (i = 0; i < n; i++)
-        if (!(av_pix_fmt_descriptors[i].flags & PIX_FMT_HWACCEL))
+    for (i = 0; i < n; i++) {
+        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);
+        if (!(desc->flags & PIX_FMT_HWACCEL))
             count++;
+    }
 
     if (!(fmts = av_malloc((count+1) * sizeof(int))))
         return NULL;
     for (j = 0, i = 0; i < n; i++) {
-        if (!(av_pix_fmt_descriptors[i].flags & PIX_FMT_HWACCEL))
+        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(i);
+        if (!(desc->flags & PIX_FMT_HWACCEL))
             fmts[j++] = i;
     }
     fmts[j] = -1;