Replace some occurrences of -1 with PIX_FMT_NONE.

Fixes icc warning #188: enumerated type mixed with another type

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13130 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c
index dc63dae58f3e1c94edab07b605184a3480426734..b5be9ae2acaa2faf60bade125a096bb28a963ec9 100644 (file)
--- a/libavcodec/8bps.c
+++ b/libavcodec/8bps.c
@@ -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 --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 0d7188e7fa77694f481675a15ad19a25337700db..0e80a610e4facd0c9fe930e611df48190faeb30b 100644 (file)
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -639,7 +639,7 @@ AVCodec asv1_encoder = {
     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 @@ AVCodec asv2_encoder = {
     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 --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c
index 437b62d840934d0fc3fd377d3add93447cfec972..0cee7c61ab6092dc6df173417d5e85ab8607a435 100644 (file)
--- a/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@@ -94,6 +94,6 @@ AVCodec bmp_encoder = {
     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 --git a/libavcodec/dv.c b/libavcodec/dv.c
index 60371136f214a420f4765a0016443e5f0d0513dc..71602f5f2c8e7fdfecdc3887ebf713462bfe61ac 100644 (file)
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -1239,7 +1239,7 @@ AVCodec dvvideo_encoder = {
     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 --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 80138b5d1efc8b102904cacc24fa58960f55ce7e..23adf287c6d843a32edefe9182badab9f38f39b9 100644 (file)
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1035,7 +1035,7 @@ AVCodec ffv1_encoder = {
     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 --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 37a7f1978232ad7973c91cab5973f022c345de6e..fc87b6a301363aa0574f1f072ad2400b40c465bd 100644 (file)
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -254,6 +254,6 @@ AVCodec flashsv_decoder = {
     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 --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c
index 97e0abd26557584ead0ac6803f08d864fcd6a56a..2a95ffb45b2f6dfa512db5cf90d42ddbd6f6b3c4 100644 (file)
--- a/libavcodec/flashsvenc.c
+++ b/libavcodec/flashsvenc.c
@@ -292,7 +292,7 @@ AVCodec flashsv_encoder = {
     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 --git a/libavcodec/gif.c b/libavcodec/gif.c
index d172593dbc50cc9d566244ed26e4ba7cf2061f15..7dd248e64c7485b7af854849ec392798e266447b 100644 (file)
--- a/libavcodec/gif.c
+++ b/libavcodec/gif.c
@@ -340,6 +340,6 @@ AVCodec gif_encoder = {
     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 --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c
index f8e3b7223308552d9269d523cac043df069b253b..783d5dc09b963276d1cfe7f92fe26616f4ee672a 100644 (file)
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@ -329,7 +329,7 @@ AVCodec h261_encoder = {
     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 --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index a9a054701af50efa12509e292eb2d02f76789508..3c570874dc3a5de1aa4241d66817dec637cf92c8 100644 (file)
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -1473,7 +1473,7 @@ AVCodec huffyuv_encoder = {
     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 @@ AVCodec ffvhuff_encoder = {
     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 --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c
index bdfa287c0e7dc695959d729cf018e0bf3a0656c5..c3c693a0873e67134e8867d58e0c791ab58fb0ba 100644 (file)
--- a/libavcodec/jpeglsenc.c
+++ b/libavcodec/jpeglsenc.c
@@ -389,6 +389,6 @@ AVCodec jpegls_encoder = { //FIXME avoid MPV_* lossless JPEG should not need the
     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 --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c
index b9d5bc7aff42499e467cd3a32d1fc471f41082ca..516b881113ad815700fe0f6ceeca07321590c0d6 100644 (file)
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
@@ -383,5 +383,5 @@ AVCodec libschroedinger_encoder = {
     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 --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index b08b387a744ac19edf38fb9846cd4a18ddb067e6..d516d443e337a54eb962a8c3a6b489c123dcc71a 100644 (file)
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -264,7 +264,7 @@ static int encode_close(AVCodecContext* avc_context)
     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 --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 2e3a88ebd9ecb6099aa604777f8b49e0f05d59aa..f82083a6c49bbe5c1a629a04ec70f8398ef2b870 100644 (file)
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -296,6 +296,6 @@ AVCodec libx264_encoder = {
     .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 --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index a97e0da5ebd93a40d61c518d6dad6f7ae1398bcc..0f4eaf4c614fb25c77fb049806e9af3e36d3555c 100644 (file)
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -773,6 +773,6 @@ AVCodec libxvid_encoder = {
     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 --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index d76341c0e7533f876e3192dfc1a4110261ba53fd..d131195f2ae1b993ce0b8ac3db61119c50f6056e 100644 (file)
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -454,6 +454,6 @@ AVCodec mjpeg_encoder = {
     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 --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 282d14790a1645aba86a0fb9038c9f13a625ae6b..86e1334a24b3ea65a3b5b3472a4506f17d92b103 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -70,13 +70,13 @@ extern int XVMC_field_end(MpegEncContext *s);
 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 --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 4aaa0972dbfe7f7dca4366b6c3c2cf5799679156..689a9ea74a367f55b8b6026f30c82658e083d7c8 100644 (file)
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -936,7 +936,7 @@ AVCodec mpeg1video_encoder = {
     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 @@ AVCodec mpeg2video_encoder = {
     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 --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 8b6aa4330bd8e06ab7821358913a7b0903c48de2..12f87c44b7236aa393584ef7db1558ef191d52a8 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -3743,7 +3743,7 @@ AVCodec h263_encoder = {
     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 @@ AVCodec h263p_encoder = {
     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 @@ AVCodec flv_encoder = {
     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 @@ AVCodec rv10_encoder = {
     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 @@ AVCodec rv20_encoder = {
     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 @@ AVCodec mpeg4_encoder = {
     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 @@ AVCodec msmpeg4v1_encoder = {
     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 @@ AVCodec msmpeg4v2_encoder = {
     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 @@ AVCodec msmpeg4v3_encoder = {
     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 @@ AVCodec wmv1_encoder = {
     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 --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index 1ac9f311b82b5d42c0d616ddcf405e35d8181e0c..74376af492c91d1c90f7e5148317fcb53a68948a 100644 (file)
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -444,6 +444,6 @@ AVCodec png_encoder = {
     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 --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index b745779dd44493dd726eb7e15ccbe43eea5cb70c..7ea286a878f96fd4cb1c6ca3f04cddc1530c8e5b 100644 (file)
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -364,7 +364,7 @@ AVCodec pgm_encoder = {
     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 @@ AVCodec pgmyuv_encoder = {
     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 @@ AVCodec ppm_encoder = {
     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 @@ AVCodec pbm_encoder = {
     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 @@ AVCodec pam_encoder = {
     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 --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index 212ad7caacb424f459597180c229f0804c6a45ba..c11233282000c0a828c948c50300f78f7ea840fc 100644 (file)
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -322,6 +322,6 @@ AVCodec qtrle_encoder = {
     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 --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index dfba2510fa2b4cfd3766cd08d75fbececfb981d4..667b821e111cbafac039f094fb725e24207def58 100644 (file)
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -1065,6 +1065,6 @@ AVCodec roq_encoder =
     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 --git a/libavcodec/sgienc.c b/libavcodec/sgienc.c
index dffc899f03ca8923e602c04cb6e201e219bcfc22..c85c9a4e6e4c2e3ff0ccee7d60dd40e68550bbf6 100644 (file)
--- a/libavcodec/sgienc.c
+++ b/libavcodec/sgienc.c
@@ -151,7 +151,7 @@ AVCodec sgi_encoder = {
     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 --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 666be9e640a7de7a83e03799221ebfaf00717e0a..fd9607495ef21d5b0bf2a2eb8c511d456949eaa9 100644 (file)
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -825,6 +825,6 @@ AVCodec svq1_decoder = {
     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 --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index fffa85ebf9e921eeb00f1ce2976ef7ad34a21240..a9713ea320afce90ef4f0f5bd947768f7acee344 100644 (file)
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -584,6 +584,6 @@ AVCodec svq1_encoder = {
     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 --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index 8a23cc1f3649d601bafaea22d0b4fad312d0c702..90dc8cba617f4a35c0d47594b0e42b21512c107d 100644 (file)
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -145,6 +145,6 @@ AVCodec targa_encoder = {
     .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 --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 2382ed8d271402bb065cfcb9a31ede91c2883b5e..c2b942f1d98a40fab20fe4b3f7782cdd4410200a 100644 (file)
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -456,6 +456,6 @@ AVCodec tiff_encoder = {
                               PIX_FMT_YUV420P, PIX_FMT_YUV422P,
                               PIX_FMT_YUV444P, PIX_FMT_YUV410P,
                               PIX_FMT_YUV411P,
-                              -1},
+                              PIX_FMT_NONE},
     .long_name = "TIFF image",
 };

diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 289721ba7ff6cd9d3a07c062b7eed59ba92c6efb..c7b8899f61df4d0ff27ee6517e01ce7ee599ba50 100644 (file)
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -236,6 +236,6 @@ AVCodec wmv2_encoder = {
     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 --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index 0bf1dff1926e9ff7d9ac0e69399a47fdda2d8337..f51688eea82fefbb3b04d8365df042edd687a6e2 100644 (file)
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -329,6 +329,6 @@ AVCodec zmbv_encoder = {
     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",
 };

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 319983b8fa0b775b6f0b8c5e69575d33090a3edf..95eea3cd92abbc61250f2e732c0bd232e34a919d 100644 (file)
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -223,7 +223,7 @@ static enum PixelFormat fmt_v4l2ff(uint32_t pix_fmt)
         }
     }
 
-    return -1;
+    return PIX_FMT_NONE;
 }
 
 static int mmap_init(AVFormatContext *ctx)