Fixes for C89 compliance. The libffmpeg-devel people are targeting C99 so they don't want patches. However, I'm packaging xine for blastwave.org (we package software for Solaris) and we don't have a C99 compliant version of Sun Workshop yet (and gcc is poor on SPARC by comparison) so I'm making these patches to libffmpeg/libavcodec as necessary -_-.

CVS patchset: 4541
CVS date: 2003/04/05 22:42:28

5 files changed, 602 insertions, 154 deletions

diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h
index 6c0271916..26ec68e2e 100644
--- a/src/libffmpeg/libavcodec/common.h
+++ b/src/libffmpeg/libavcodec/common.h
@@ -53,10 +53,10 @@
 #define AVOPTION_CODEC_INT(name, help, field, minv, maxv, defval) \
     { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_INT, minv, maxv, defval }
 #define AVOPTION_CODEC_STRING(name, help, field, str, val) \
-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_STRING, .defval = val, .defstr = str }
+    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_STRING, 0, 0, val, str }
 #define AVOPTION_CODEC_RCOVERRIDE(name, help, field) \
-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, .defval = 0, .defstr = NULL }
-#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
+    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, 0, 0, 0, NULL }
+#define AVOPTION_SUB(ptr) { NULL, (const char*)ptr }
 #define AVOPTION_END() AVOPTION_SUB(NULL)
 
 struct AVOption;
diff --git a/src/libffmpeg/libavcodec/h263.c b/src/libffmpeg/libavcodec/h263.c
index a054ebfb0..6b02095dd 100644
--- a/src/libffmpeg/libavcodec/h263.c
+++ b/src/libffmpeg/libavcodec/h263.c
@@ -4080,7 +4080,7 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s)
     int a= 2<<s->sprite_warping_accuracy;
     int rho= 3-s->sprite_warping_accuracy;
     int r=16/a;
-    const int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; // only true for rectangle shapes
+    int vop_ref[4][2]= {{0,0}, {s->width,0}, {0, s->height}, {s->width, s->height}}; // only true for rectangle shapes
     int d[4][2]={{0,0}, {0,0}, {0,0}, {0,0}};
     int sprite_ref[4][2];
     int virtual_ref[2][2];
diff --git a/src/libffmpeg/libavcodec/h263dec.c b/src/libffmpeg/libavcodec/h263dec.c
index 2b9443908..d0ce51493 100644
--- a/src/libffmpeg/libavcodec/h263dec.c
+++ b/src/libffmpeg/libavcodec/h263dec.c
@@ -781,7 +781,7 @@ AVCodec mpeg4_decoder = {
     ff_h263_decode_end,
     ff_h263_decode_frame,
     CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1 | CODEC_CAP_TRUNCATED,
-    .options = mpeg4_decoptions,
+    mpeg4_decoptions,
 };
 
 AVCodec h263_decoder = {
@@ -832,7 +832,7 @@ AVCodec msmpeg4v3_decoder = {
     ff_h263_decode_end,
     ff_h263_decode_frame,
     CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
-    .options = mpeg4_decoptions,
+    mpeg4_decoptions,
 };
 
 AVCodec wmv1_decoder = {
diff --git a/src/libffmpeg/libavcodec/huffyuv.c b/src/libffmpeg/libavcodec/huffyuv.c
index ecf22bb2c..ea4d26943 100644
--- a/src/libffmpeg/libavcodec/huffyuv.c
+++ b/src/libffmpeg/libavcodec/huffyuv.c
@@ -1159,5 +1159,7 @@ AVCodec huffyuv_encoder = {
     encode_init,
     encode_frame,
     encode_end,
-    .options = huffyuv_options,
+    NULL,
+    0,
+    huffyuv_options,
 };
diff --git a/src/libffmpeg/libavcodec/imgconvert.c b/src/libffmpeg/libavcodec/imgconvert.c
index cfb21a477..6751924c5 100644
--- a/src/libffmpeg/libavcodec/imgconvert.c
+++ b/src/libffmpeg/libavcodec/imgconvert.c
@@ -48,78 +48,50 @@ typedef struct PixFmtInfo {
 
 /* this table gives more information about formats */
 static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
-    /* YUV formats */
-    [PIX_FMT_YUV420P] = {
-        .name = "yuv420p",
-        .nb_components = 3, .is_yuv = 1,
-        .x_chroma_shift = 1, .y_chroma_shift = 1, 
+    { /*PIX_FMT_YUV420P*/
+        "yuv420p", 3, 1, 0, 0, 0, 0, 1, 1,
     },
-    [PIX_FMT_YUV422P] = {
-        .name = "yuv422p",
-        .nb_components = 3, .is_yuv = 1,
-        .x_chroma_shift = 1, .y_chroma_shift = 0, 
+    { /*PIX_FMT_YUV422*/
+        "yuv422", 1, 1, 1, 0, 0, 0, 1, 0,
     },
-    [PIX_FMT_YUV444P] = {
-        .name = "yuv444p",
-        .nb_components = 3, .is_yuv = 1,
-        .x_chroma_shift = 0, .y_chroma_shift = 0, 
+    { /*PIX_FMT_RGB24*/
+        "rgb24", 1, 0, 1, 0, 0, 0, 0, 0,
     },
-    [PIX_FMT_YUV422] = {
-        .name = "yuv422",
-        .nb_components = 1, .is_yuv = 1, .is_packed = 1,
-        .x_chroma_shift = 1, .y_chroma_shift = 0,
+    { /*PIX_FMT_BGR24*/
+        "bgr24", 1, 0, 1, 0, 0, 0, 0, 0,
     },
-    [PIX_FMT_YUV410P] = {
-        .name = "yuv410p",
-        .nb_components = 3, .is_yuv = 1,
-        .x_chroma_shift = 2, .y_chroma_shift = 2,
+    { /*PIX_FMT_YUV422P*/
+        "yuv422p", 3, 1, 0, 0, 0, 0, 1, 0,
     },
-    [PIX_FMT_YUV411P] = {
-        .name = "yuv411p",
-        .nb_components = 3, .is_yuv = 1,
-        .x_chroma_shift = 2, .y_chroma_shift = 0,
+    { /*PIX_FMT_YUV444P*/
+        "yuv444p", 3, 1, 0, 0, 0, 0, 0, 0,
     },
-
-    /* RGB formats */
-    [PIX_FMT_RGB24] = {
-        .name = "rgb24",
-        .nb_components = 1, .is_packed = 1,
+    { /*PIX_FMT_RGBA32*/
+        "rgba32", 1, 0, 1, 0, 1, 0, 0, 0,
     },
-    [PIX_FMT_BGR24] = {
-        .name = "bgr24",
-        .nb_components = 1, .is_packed = 1,
+    { /*PIX_FMT_YUV410P*/
+        "yuv410p", 3, 1, 0, 0, 0, 0, 2, 2,
     },
-    [PIX_FMT_RGBA32] = {
-        .name = "rgba32",
-        .nb_components = 1, .is_packed = 1, .is_alpha = 1,
+    { /*PIX_FMT_YUV411P*/
+        "yuv411p", 3, 1, 0, 0, 0, 0, 2, 0,
     },
-    [PIX_FMT_RGB565] = {
-        .name = "rgb565",
-        .nb_components = 1, .is_packed = 1,
+    { /*PIX_FMT_RGB565*/
+        "rgb565", 1, 0, 1, 0, 0, 0, 0, 0,
     },
-    [PIX_FMT_RGB555] = {
-        .name = "rgb555",
-        .nb_components = 1, .is_packed = 1, .is_alpha = 1,
+    { /*PIX_FMT_RGB555*/
+        "rgb555", 1, 0, 1, 0, 1, 0, 0, 0,
     },
-
-    /* gray / mono formats */
-    [PIX_FMT_GRAY8] = {
-        .name = "gray",
-        .nb_components = 1, .is_gray = 1,
+    { /*PIX_FMT_GRAY8*/
+        "gray", 1, 0, 0, 0, 0, 1, 0, 0,
     },
-    [PIX_FMT_MONOWHITE] = {
-        .name = "monow",
-        .nb_components = 1, .is_packed = 1, .is_gray = 1,
+    { /*PIX_FMT_MONOWHITE*/
+        "monow", 1, 0, 1, 0, 0, 1, 0, 0,
     },
-    [PIX_FMT_MONOBLACK] = {
-        .name = "monob",
-        .nb_components = 1, .is_packed = 1, .is_gray = 1,
+    { /*PIX_FMT_MONOBLACK*/
+        "monob", 1, 0, 1, 0, 0, 1, 0, 0,
     },
-
-    /* paletted formats */
-    [PIX_FMT_PAL8] = {
-        .name = "pal8",
-        .nb_components = 1, .is_packed = 1, .is_paletted = 1,
+    { /*PIX_FMT_PAL8*/
+        "pal8", 1, 0, 1, 1, 0, 0, 0, 0,
     },
 };
 
@@ -1092,143 +1064,617 @@ typedef struct ConvertEntry {
    - all non YUV modes must convert at least to and from PIX_FMT_RGB24
 */
 static ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
-    [PIX_FMT_YUV420P] = {
-        [PIX_FMT_RGB555] = { 
-            .convert = yuv420p_to_rgb555
+    { /*PIX_FMT_YUV420P*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            yuv420p_to_rgb24
+        },
+        { /*PIX_FMT_BGR24*/
+            yuv420p_to_bgr24
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32]*/
+            yuv420p_to_rgba32
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
         },
-        [PIX_FMT_RGB565] = { 
-            .convert = yuv420p_to_rgb565
+        { /*PIX_FMT_RGB565*/
+            yuv420p_to_rgb565
         },
-        [PIX_FMT_BGR24] = { 
-            .convert = yuv420p_to_bgr24
+        { /*PIX_FMT_RGB555*/
+            yuv420p_to_rgb555
         },
-        [PIX_FMT_RGB24] = { 
-            .convert = yuv420p_to_rgb24
+        { /*PIX_FMT_GRAY8*/
+            NULL
         },
-        [PIX_FMT_RGBA32] = { 
-            .convert = yuv420p_to_rgba32
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_YUV422P] = {
-        [PIX_FMT_RGB555] = { 
-            .convert = yuv422p_to_rgb555
+    { /*PIX_FMT_YUV422*/
+        { /*PIX_FMT_YUV420P*/
+            yuv422_to_yuv420p
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
         },
-        [PIX_FMT_RGB565] = { 
-            .convert = yuv422p_to_rgb565
+        { /*PIX_FMT_RGB555*/
+            NULL
         },
-        [PIX_FMT_BGR24] = { 
-            .convert = yuv422p_to_bgr24
+        { /*PIX_FMT_GRAY8*/
+            NULL
         },
-        [PIX_FMT_RGB24] = { 
-            .convert = yuv422p_to_rgb24
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
         },
-        [PIX_FMT_RGBA32] = { 
-            .convert = yuv422p_to_rgba32
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_YUV422] = { 
-        [PIX_FMT_YUV420P] = { 
-            .convert = yuv422_to_yuv420p,
+    { /*PIX_FMT_RGB24*/
+        { /*PIX_FMT_YUV420P*/ 
+            rgb24_to_yuv420p
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            rgb24_to_rgb565
+        },
+        { /*PIX_FMT_RGB555*/
+            rgb24_to_rgb555
+        },
+        { /*PIX_FMT_GRAY8*/
+            rgb24_to_gray
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
+        },
+        { /*PIX_FMT_PAL8*/
+            rgb24_to_pal8
         },
     },
-
-    [PIX_FMT_RGB24] = {
-        [PIX_FMT_YUV420P] = { 
-            .convert = rgb24_to_yuv420p
+    { /*PIX_FMT_BGR24*/
+        { /*PIX_FMT_YUV420P*/ 
+            bgr24_to_yuv420p
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
         },
-        [PIX_FMT_RGB565] = { 
-            .convert = rgb24_to_rgb565
+        { /*PIX_FMT_RGBA32*/
+            NULL
         },
-        [PIX_FMT_RGB555] = { 
-            .convert = rgb24_to_rgb555
+        { /*PIX_FMT_YUV410P*/
+            NULL
         },
-        [PIX_FMT_GRAY8] = { 
-            .convert = rgb24_to_gray
+        { /*PIX_FMT_YUV411P*/
+            NULL
         },
-        [PIX_FMT_PAL8] = { 
-            .convert = rgb24_to_pal8
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/
+            bgr24_to_gray
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_RGBA32] = {
-        [PIX_FMT_YUV420P] = { 
-            .convert = rgba32_to_yuv420p
+    { /*PIX_FMT_YUV422P*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            yuv422p_to_bgr24
+        },
+        { /*PIX_FMT_RGB24*/
+            yuv422p_to_rgb24
+        },
+        { /*PIX_FMT_RGBA32*/
+            yuv422p_to_rgba32
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            yuv422p_to_rgb555
         },
-        [PIX_FMT_GRAY8] = { 
-            .convert = rgba32_to_gray
+        { /*PIX_FMT_RGB565*/
+            yuv422p_to_rgb565
+        },
+        { /*PIX_FMT_GRAY8*/
+            NULL
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_BGR24] = {
-        [PIX_FMT_YUV420P] = { 
-            .convert = bgr24_to_yuv420p
+    { /*PIX_FMT_YUV444P*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
         },
-        [PIX_FMT_GRAY8] = { 
-            .convert = bgr24_to_gray
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/
+            NULL
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_RGB555] = {
-        [PIX_FMT_YUV420P] = { 
-            .convert = rgb555_to_yuv420p
+    { /*PIX_FMT_RGBA32*/
+        { /*PIX_FMT_YUV420P*/
+            rgba32_to_yuv420p
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
         },
-        [PIX_FMT_GRAY8] = { 
-            .convert = rgb555_to_gray
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/ 
+            rgba32_to_gray
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_RGB565] = {
-        [PIX_FMT_YUV420P] = { 
-            .convert = rgb565_to_yuv420p
+    { /*PIX_FMT_YUV410P*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
         },
-        [PIX_FMT_GRAY8] = { 
-            .convert = rgb565_to_gray
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/
+            NULL
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_GRAY8] = {
-        [PIX_FMT_RGB555] = { 
-            .convert = gray_to_rgb555
+    { /*PIX_FMT_YUV411P*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
         },
-        [PIX_FMT_RGB565] = { 
-            .convert = gray_to_rgb565
+        { /*PIX_FMT_BGR24*/
+            NULL
         },
-        [PIX_FMT_RGB24] = { 
-            .convert = gray_to_rgb24
+        { /*PIX_FMT_YUV422P*/
+            NULL
         },
-        [PIX_FMT_BGR24] = { 
-            .convert = gray_to_bgr24
+        { /*PIX_FMT_YUV444P*/
+            NULL
         },
-        [PIX_FMT_RGBA32] = { 
-            .convert = gray_to_rgba32
+        { /*PIX_FMT_RGBA32*/
+            NULL
         },
-        [PIX_FMT_MONOWHITE] = { 
-            .convert = gray_to_monowhite
+        { /*PIX_FMT_YUV410P*/
+            NULL
         },
-        [PIX_FMT_MONOBLACK] = { 
-            .convert = gray_to_monoblack
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/
+            NULL
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_MONOWHITE] = {
-        [PIX_FMT_GRAY8] = { 
-            .convert = monowhite_to_gray
+    { /*PIX_FMT_RGB565*/
+        { /*PIX_FMT_YUV420P*/
+            rgb565_to_yuv420p
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/
+            rgb565_to_gray
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_MONOBLACK] = {
-        [PIX_FMT_GRAY8] = { 
-            .convert = monoblack_to_gray
+    { /*PIX_FMT_RGB555*/
+        { /*PIX_FMT_YUV420P*/
+            rgb555_to_yuv420p
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/
+            rgb555_to_gray
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
+        },
+    },
+    { /*PIX_FMT_GRAY8*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            gray_to_rgb24
+        },
+        { /*PIX_FMT_BGR24*/
+            gray_to_bgr24
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            gray_to_rgba32
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            gray_to_rgb565
+        },
+        { /*PIX_FMT_RGB555*/
+            gray_to_rgb555
+        },
+        { /*PIX_FMT_GRAY8*/
+            NULL
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            gray_to_monowhite
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            gray_to_monoblack
+        },
+    },
+    { /*PIX_FMT_MONOWHITE*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            NULL
+        },
+        { /*PIX_FMT_BGR24*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            NULL
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            NULL
+        },
+        { /*PIX_FMT_RGB555*/
+            NULL
+        },
+        { /*PIX_FMT_GRAY8*/
+            monowhite_to_gray
+        },
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
+        },
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
-    [PIX_FMT_PAL8] = {
-        [PIX_FMT_RGB555] = { 
-            .convert = pal8_to_rgb555
+    { /*PIX_FMT_PAL8*/
+        { /*PIX_FMT_YUV420P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV422*/
+            NULL
+        },
+        { /*PIX_FMT_RGB24*/
+            pal8_to_rgb24
+        },
+        { /*PIX_FMT_BGR24*/
+            pal8_to_bgr24
+        },
+        { /*PIX_FMT_YUV422P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV444P*/
+            NULL
+        },
+        { /*PIX_FMT_RGBA32*/
+            pal8_to_rgba32
+        },
+        { /*PIX_FMT_YUV410P*/
+            NULL
+        },
+        { /*PIX_FMT_YUV411P*/
+            NULL
+        },
+        { /*PIX_FMT_RGB565*/
+            pal8_to_rgb565
         },
-        [PIX_FMT_RGB565] = { 
-            .convert = pal8_to_rgb565
+        { /*PIX_FMT_RGB555*/
+            pal8_to_rgb555
         },
-        [PIX_FMT_BGR24] = { 
-            .convert = pal8_to_bgr24
+        { /*PIX_FMT_GRAY8*/
+            NULL
         },
-        [PIX_FMT_RGB24] = { 
-            .convert = pal8_to_rgb24
+        { /*PIX_FMT_MONOWHITE*/
+            NULL
         },
-        [PIX_FMT_RGBA32] = { 
-            .convert = pal8_to_rgba32
+        { /*PIX_FMT_MONOBLACK*/
+            NULL
         },
     },
 };