Commit eacced45 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files

Replace some occurrences of -1 with PIX_FMT_NONE.

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

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 488aca9b
......@@ -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
......
......@@ -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",
};
......
......@@ -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",
};
......@@ -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
......
......@@ -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
......@@ -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",
};
......@@ -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",
};
......@@ -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)",
};
......@@ -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",
};
......@@ -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",
};
......
......@@ -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",
};
......@@ -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},
};
......@@ -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 =
......
......@@ -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",
};
......@@ -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",
};
......@@ -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)",
};
......@@ -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];
......
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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",
};
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment