diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-11 22:28:43 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-11 22:28:43 +0000 |
| commit | eacced45c47222efebcf66bfced9375a16490e07 (patch) | |
| tree | 6955e28d81e19ae992f6be7812d05714e80456eb /libavcodec/pnmenc.c | |
| parent | 488aca9b1e2eb9136b77e00335b2f529cbb248d2 (diff) | |
| download | ffmpeg-eacced45c47222efebcf66bfced9375a16490e07.tar.gz | |
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
Diffstat (limited to 'libavcodec/pnmenc.c')
| -rw-r--r-- | libavcodec/pnmenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index b745779dd4..7ea286a878 100644 --- 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 |