# HG changeset patch
# User cehoyos
# Date 1210544923 0
# Node ID e1302edb0f6945b2fbdee3557be05d93ada829ef
# Parent  d24da66bec7621f12dd14ba1b36a2596191fbccf
Replace some occurrences of -1 with PIX_FMT_NONE.
Fixes icc warning #188: enumerated type mixed with another type

diff -r d24da66bec76 -r e1302edb0f69 8bps.c
--- a/8bps.c	Sun May 11 20:26:35 2008 +0000
+++ b/8bps.c	Sun May 11 22:28:43 2008 +0000
@@ -37,7 +37,7 @@
 #include "avcodec.h"
 
 
-static const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGB32, -1};
+static const enum PixelFormat pixfmt_rgb24[] = {PIX_FMT_BGR24, PIX_FMT_RGB32, PIX_FMT_NONE};
 
 /*
  * Decoder context
diff -r d24da66bec76 -r e1302edb0f69 asv1.c
--- a/asv1.c	Sun May 11 20:26:35 2008 +0000
+++ b/asv1.c	Sun May 11 22:28:43 2008 +0000
@@ -639,7 +639,7 @@
     encode_init,
     encode_frame,
     //encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "ASUS V1",
 };
 
@@ -651,7 +651,7 @@
     encode_init,
     encode_frame,
     //encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "ASUS V2",
 };
 
diff -r d24da66bec76 -r e1302edb0f69 bmpenc.c
--- a/bmpenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/bmpenc.c	Sun May 11 22:28:43 2008 +0000
@@ -94,6 +94,6 @@
     bmp_encode_init,
     bmp_encode_frame,
     NULL, //encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
     .long_name = "BMP image",
 };
diff -r d24da66bec76 -r e1302edb0f69 dv.c
--- a/dv.c	Sun May 11 20:26:35 2008 +0000
+++ b/dv.c	Sun May 11 22:28:43 2008 +0000
@@ -1239,7 +1239,7 @@
     sizeof(DVVideoContext),
     dvvideo_init,
     dvvideo_encode_frame,
-    .pix_fmts = (enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, -1},
+    .pix_fmts = (enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name = "DV (Digital Video)",
 };
 #endif // CONFIG_DVVIDEO_ENCODER
diff -r d24da66bec76 -r e1302edb0f69 ffv1.c
--- a/ffv1.c	Sun May 11 20:26:35 2008 +0000
+++ b/ffv1.c	Sun May 11 22:28:43 2008 +0000
@@ -1035,7 +1035,7 @@
     encode_init,
     encode_frame,
     common_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV411P, PIX_FMT_YUV410P, PIX_FMT_RGB32, PIX_FMT_NONE},
     .long_name= "FFmpeg codec #1",
 };
 #endif
diff -r d24da66bec76 -r e1302edb0f69 flashsv.c
--- a/flashsv.c	Sun May 11 20:26:35 2008 +0000
+++ b/flashsv.c	Sun May 11 22:28:43 2008 +0000
@@ -254,6 +254,6 @@
     flashsv_decode_end,
     flashsv_decode_frame,
     CODEC_CAP_DR1,
-    .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1},
+    .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
     .long_name = "Flash Screen Video v1",
 };
diff -r d24da66bec76 -r e1302edb0f69 flashsvenc.c
--- a/flashsvenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/flashsvenc.c	Sun May 11 22:28:43 2008 +0000
@@ -292,7 +292,7 @@
     flashsv_encode_init,
     flashsv_encode_frame,
     flashsv_encode_end,
-    .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1},
+    .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_NONE},
     .long_name = "Flash Screen Video",
 };
 
diff -r d24da66bec76 -r e1302edb0f69 gif.c
--- a/gif.c	Sun May 11 20:26:35 2008 +0000
+++ b/gif.c	Sun May 11 22:28:43 2008 +0000
@@ -340,6 +340,6 @@
     gif_encode_init,
     gif_encode_frame,
     NULL, //encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_PAL8, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE},
     .long_name= "GIF (Graphics Interchange Format)",
 };
diff -r d24da66bec76 -r e1302edb0f69 h261enc.c
--- a/h261enc.c	Sun May 11 20:26:35 2008 +0000
+++ b/h261enc.c	Sun May 11 22:28:43 2008 +0000
@@ -329,7 +329,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "H.261",
 };
 
diff -r d24da66bec76 -r e1302edb0f69 huffyuv.c
--- a/huffyuv.c	Sun May 11 20:26:35 2008 +0000
+++ b/huffyuv.c	Sun May 11 22:28:43 2008 +0000
@@ -1473,7 +1473,7 @@
     encode_init,
     encode_frame,
     encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE},
     .long_name = "Huffyuv / HuffYUV",
 };
 
@@ -1485,7 +1485,7 @@
     encode_init,
     encode_frame,
     encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_RGB32, PIX_FMT_NONE},
     .long_name = "Huffyuv FFmpeg variant",
 };
 
diff -r d24da66bec76 -r e1302edb0f69 jpeglsenc.c
--- a/jpeglsenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/jpeglsenc.c	Sun May 11 22:28:43 2008 +0000
@@ -389,6 +389,6 @@
     encode_init_ls,
     encode_picture_ls,
     NULL,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB24, PIX_FMT_GRAY8, PIX_FMT_GRAY16, PIX_FMT_NONE},
     .long_name= "JPEG-LS",
 };
diff -r d24da66bec76 -r e1302edb0f69 libschroedingerenc.c
--- a/libschroedingerenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/libschroedingerenc.c	Sun May 11 22:28:43 2008 +0000
@@ -383,5 +383,5 @@
     libschroedinger_encode_frame,
     libschroedinger_encode_close,
    .capabilities= CODEC_CAP_DELAY,
-   .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, -1},
+   .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUV444P, PIX_FMT_NONE},
 };
diff -r d24da66bec76 -r e1302edb0f69 libtheoraenc.c
--- a/libtheoraenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/libtheoraenc.c	Sun May 11 22:28:43 2008 +0000
@@ -264,7 +264,7 @@
     return -1;
 }
 
-static const enum PixelFormat supported_pixel_formats[] = { PIX_FMT_YUV420P, -1 };
+static const enum PixelFormat supported_pixel_formats[] = { PIX_FMT_YUV420P, PIX_FMT_NONE };
 
 /*! AVCodec struct exposed to libavcodec */
 AVCodec libtheora_encoder =
diff -r d24da66bec76 -r e1302edb0f69 libx264.c
--- a/libx264.c	Sun May 11 20:26:35 2008 +0000
+++ b/libx264.c	Sun May 11 22:28:43 2008 +0000
@@ -296,6 +296,6 @@
     .encode = X264_frame,
     .close = X264_close,
     .capabilities = CODEC_CAP_DELAY,
-    .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, -1 },
+    .pix_fmts = (enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE },
     .long_name = "libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
 };
diff -r d24da66bec76 -r e1302edb0f69 libxvidff.c
--- a/libxvidff.c	Sun May 11 20:26:35 2008 +0000
+++ b/libxvidff.c	Sun May 11 22:28:43 2008 +0000
@@ -773,6 +773,6 @@
     ff_xvid_encode_init,
     ff_xvid_encode_frame,
     ff_xvid_encode_close,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "libxvidcore MPEG-4 part 2",
 };
diff -r d24da66bec76 -r e1302edb0f69 mjpegenc.c
--- a/mjpegenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/mjpegenc.c	Sun May 11 22:28:43 2008 +0000
@@ -454,6 +454,6 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE},
     .long_name= "MJPEG (Motion JPEG)",
 };
diff -r d24da66bec76 -r e1302edb0f69 mpeg12.c
--- a/mpeg12.c	Sun May 11 20:26:35 2008 +0000
+++ b/mpeg12.c	Sun May 11 22:28:43 2008 +0000
@@ -70,13 +70,13 @@
 extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp);
 extern void XVMC_init_block(MpegEncContext *s);//set s->block
 
-static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1};
-static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1};
-static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1};
+static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,PIX_FMT_NONE};
+static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,PIX_FMT_NONE};
+static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,PIX_FMT_NONE};
 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
                                            PIX_FMT_XVMC_MPEG2_IDCT,
                                            PIX_FMT_XVMC_MPEG2_MC,
-                                           -1};
+                                           PIX_FMT_NONE};
 
 uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
diff -r d24da66bec76 -r e1302edb0f69 mpeg12enc.c
--- a/mpeg12enc.c	Sun May 11 20:26:35 2008 +0000
+++ b/mpeg12enc.c	Sun May 11 22:28:43 2008 +0000
@@ -936,7 +936,7 @@
     MPV_encode_picture,
     MPV_encode_end,
     .supported_framerates= ff_frame_rate_tab+1,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .capabilities= CODEC_CAP_DELAY,
     .long_name= "MPEG-1 video",
 };
@@ -950,7 +950,7 @@
     MPV_encode_picture,
     MPV_encode_end,
     .supported_framerates= ff_frame_rate_tab+1,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE},
     .capabilities= CODEC_CAP_DELAY,
     .long_name= "MPEG-2 video",
 };
diff -r d24da66bec76 -r e1302edb0f69 mpegvideo_enc.c
--- a/mpegvideo_enc.c	Sun May 11 20:26:35 2008 +0000
+++ b/mpegvideo_enc.c	Sun May 11 22:28:43 2008 +0000
@@ -3743,7 +3743,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "H.263",
 };
 
@@ -3755,7 +3755,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "H.263+ / H.263 version 2",
 };
 
@@ -3767,7 +3767,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "Flash Video",
 };
 
@@ -3779,7 +3779,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "RealVideo 1.0",
 };
 
@@ -3791,7 +3791,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "RealVideo 2.0",
 };
 
@@ -3803,7 +3803,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .capabilities= CODEC_CAP_DELAY,
     .long_name= "MPEG-4 part 2",
 };
@@ -3816,7 +3816,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "MPEG-4 part 2 Microsoft variant version 1",
 };
 
@@ -3828,7 +3828,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "MPEG-4 part 2 Microsoft variant version 2",
 };
 
@@ -3840,7 +3840,7 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "MPEG-4 part 2 Microsoft variant version 3",
 };
 
@@ -3852,6 +3852,6 @@
     MPV_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "Windows Media Video 7",
 };
diff -r d24da66bec76 -r e1302edb0f69 pngenc.c
--- a/pngenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/pngenc.c	Sun May 11 22:28:43 2008 +0000
@@ -444,6 +444,6 @@
     png_enc_init,
     encode_frame,
     NULL, //encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_NONE},
     .long_name= "PNG image",
 };
diff -r d24da66bec76 -r e1302edb0f69 pnmenc.c
--- a/pnmenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/pnmenc.c	Sun May 11 22:28:43 2008 +0000
@@ -364,7 +364,7 @@
     pnm_encode_frame,
     NULL, //encode_end,
     pnm_decode_frame,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE},
     .long_name= "PGM (Portable GrayMap) image",
 };
 #endif // CONFIG_PGM_ENCODER
@@ -379,7 +379,7 @@
     pnm_encode_frame,
     NULL, //encode_end,
     pnm_decode_frame,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "PGMYUV (Portable GrayMap YUV) image",
 };
 #endif // CONFIG_PGMYUV_ENCODER
@@ -394,7 +394,7 @@
     pnm_encode_frame,
     NULL, //encode_end,
     pnm_decode_frame,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_NONE},
     .long_name= "PPM (Portable PixelMap) image",
 };
 #endif // CONFIG_PPM_ENCODER
@@ -409,7 +409,7 @@
     pnm_encode_frame,
     NULL, //encode_end,
     pnm_decode_frame,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE},
     .long_name= "PBM (Portable BitMap) image",
 };
 #endif // CONFIG_PBM_ENCODER
@@ -424,7 +424,7 @@
     pam_encode_frame,
     NULL, //encode_end,
     pnm_decode_frame,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE},
     .long_name= "PAM (Portable AnyMap) image",
 };
 #endif // CONFIG_PAM_ENCODER
diff -r d24da66bec76 -r e1302edb0f69 qtrleenc.c
--- a/qtrleenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/qtrleenc.c	Sun May 11 22:28:43 2008 +0000
@@ -322,6 +322,6 @@
     qtrle_encode_init,
     qtrle_encode_frame,
     qtrle_encode_end,
-    .pix_fmts = (enum PixelFormat[]){PIX_FMT_RGB24, -1},
+    .pix_fmts = (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_NONE},
     .long_name = "QuickTime Animation (RLE) video",
 };
diff -r d24da66bec76 -r e1302edb0f69 roqvideoenc.c
--- a/roqvideoenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/roqvideoenc.c	Sun May 11 22:28:43 2008 +0000
@@ -1065,6 +1065,6 @@
     roq_encode_frame,
     roq_encode_end,
     .supported_framerates = (AVRational[]){{30,1}, {0,0}},
-    .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV444P, -1},
+    .pix_fmts = (enum PixelFormat[]){PIX_FMT_YUV444P, PIX_FMT_NONE},
     .long_name = "Id RoQ video",
 };
diff -r d24da66bec76 -r e1302edb0f69 sgienc.c
--- a/sgienc.c	Sun May 11 20:26:35 2008 +0000
+++ b/sgienc.c	Sun May 11 22:28:43 2008 +0000
@@ -151,7 +151,7 @@
     encode_init,
     encode_frame,
     NULL,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_PAL8, PIX_FMT_GRAY8, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_NONE},
     .long_name= "SGI image",
 };
 
diff -r d24da66bec76 -r e1302edb0f69 svq1dec.c
--- a/svq1dec.c	Sun May 11 20:26:35 2008 +0000
+++ b/svq1dec.c	Sun May 11 22:28:43 2008 +0000
@@ -825,6 +825,6 @@
     svq1_decode_frame,
     CODEC_CAP_DR1,
     .flush= ff_mpeg_flush,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE},
     .long_name= "Sorenson Vector Quantizer 1",
 };
diff -r d24da66bec76 -r e1302edb0f69 svq1enc.c
--- a/svq1enc.c	Sun May 11 20:26:35 2008 +0000
+++ b/svq1enc.c	Sun May 11 22:28:43 2008 +0000
@@ -584,6 +584,6 @@
     svq1_encode_init,
     svq1_encode_frame,
     svq1_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV410P, PIX_FMT_NONE},
     .long_name= "Sorenson Vector Quantizer 1",
 };
diff -r d24da66bec76 -r e1302edb0f69 targaenc.c
--- a/targaenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/targaenc.c	Sun May 11 22:28:43 2008 +0000
@@ -145,6 +145,6 @@
     .priv_data_size = 0,
     .init = targa_encode_init,
     .encode = targa_encode_frame,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, PIX_FMT_NONE},
     .long_name= "Truevision Targa image",
 };
diff -r d24da66bec76 -r e1302edb0f69 tiffenc.c
--- a/tiffenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/tiffenc.c	Sun May 11 22:28:43 2008 +0000
@@ -456,6 +456,6 @@
                               PIX_FMT_YUV420P, PIX_FMT_YUV422P,
                               PIX_FMT_YUV444P, PIX_FMT_YUV410P,
                               PIX_FMT_YUV411P,
-                              -1},
+                              PIX_FMT_NONE},
     .long_name = "TIFF image",
 };
diff -r d24da66bec76 -r e1302edb0f69 wmv2enc.c
--- a/wmv2enc.c	Sun May 11 20:26:35 2008 +0000
+++ b/wmv2enc.c	Sun May 11 22:28:43 2008 +0000
@@ -236,6 +236,6 @@
     wmv2_encode_init,
     MPV_encode_picture,
     MPV_encode_end,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name= "Windows Media Video 8",
 };
diff -r d24da66bec76 -r e1302edb0f69 zmbvenc.c
--- a/zmbvenc.c	Sun May 11 20:26:35 2008 +0000
+++ b/zmbvenc.c	Sun May 11 22:28:43 2008 +0000
@@ -329,6 +329,6 @@
     encode_init,
     encode_frame,
     encode_end,
-    .pix_fmts = (enum PixelFormat[]){PIX_FMT_PAL8, -1},
+    .pix_fmts = (enum PixelFormat[]){PIX_FMT_PAL8, PIX_FMT_NONE},
     .long_name = "Zip Motion Blocks Video",
 };