Mercurial > libavcodec.hg
diff pnmenc.c @ 6788:e1302edb0f69 libavcodec
Replace some occurrences of -1 with PIX_FMT_NONE.
Fixes icc warning #188: enumerated type mixed with another type
| author | cehoyos |
|---|---|
| date | Sun, 11 May 2008 22:28:43 +0000 |
| parents | 6eeb19edcee3 |
| children | e943e1409077 |
line wrap: on
line diff
--- 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