Mercurial > libavcodec.hg

comparison pnmenc.c @ 6788:e1302edb0f69 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6787:d24da66bec76 6788:e1302edb0f69
362 sizeof(PNMContext), 362 sizeof(PNMContext),
363 common_init, 363 common_init,
364 pnm_encode_frame, 364 pnm_encode_frame,
365 NULL, //encode_end, 365 NULL, //encode_end,
366 pnm_decode_frame, 366 pnm_decode_frame,
367 .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, -1}, 367 .pix_fmts= (enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE},
368 .long_name= "PGM (Portable GrayMap) image", 368 .long_name= "PGM (Portable GrayMap) image",
369 }; 369 };
370 #endif // CONFIG_PGM_ENCODER 370 #endif // CONFIG_PGM_ENCODER
371 371
372 #ifdef CONFIG_PGMYUV_ENCODER 372 #ifdef CONFIG_PGMYUV_ENCODER
377 sizeof(PNMContext), 377 sizeof(PNMContext),
378 common_init, 378 common_init,
379 pnm_encode_frame, 379 pnm_encode_frame,
380 NULL, //encode_end, 380 NULL, //encode_end,
381 pnm_decode_frame, 381 pnm_decode_frame,
382 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1}, 382 .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
383 .long_name= "PGMYUV (Portable GrayMap YUV) image", 383 .long_name= "PGMYUV (Portable GrayMap YUV) image",
384 }; 384 };
385 #endif // CONFIG_PGMYUV_ENCODER 385 #endif // CONFIG_PGMYUV_ENCODER
386 386
387 #ifdef CONFIG_PPM_ENCODER 387 #ifdef CONFIG_PPM_ENCODER
392 sizeof(PNMContext), 392 sizeof(PNMContext),
393 common_init, 393 common_init,
394 pnm_encode_frame, 394 pnm_encode_frame,
395 NULL, //encode_end, 395 NULL, //encode_end,
396 pnm_decode_frame, 396 pnm_decode_frame,
397 .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, -1}, 397 .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_NONE},
398 .long_name= "PPM (Portable PixelMap) image", 398 .long_name= "PPM (Portable PixelMap) image",
399 }; 399 };
400 #endif // CONFIG_PPM_ENCODER 400 #endif // CONFIG_PPM_ENCODER
401 401
402 #ifdef CONFIG_PBM_ENCODER 402 #ifdef CONFIG_PBM_ENCODER
407 sizeof(PNMContext), 407 sizeof(PNMContext),
408 common_init, 408 common_init,
409 pnm_encode_frame, 409 pnm_encode_frame,
410 NULL, //encode_end, 410 NULL, //encode_end,
411 pnm_decode_frame, 411 pnm_decode_frame,
412 .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, -1}, 412 .pix_fmts= (enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE},
413 .long_name= "PBM (Portable BitMap) image", 413 .long_name= "PBM (Portable BitMap) image",
414 }; 414 };
415 #endif // CONFIG_PBM_ENCODER 415 #endif // CONFIG_PBM_ENCODER
416 416
417 #ifdef CONFIG_PAM_ENCODER 417 #ifdef CONFIG_PAM_ENCODER
422 sizeof(PNMContext), 422 sizeof(PNMContext),
423 common_init, 423 common_init,
424 pam_encode_frame, 424 pam_encode_frame,
425 NULL, //encode_end, 425 NULL, //encode_end,
426 pnm_decode_frame, 426 pnm_decode_frame,
427 .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, -1}, 427 .pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE},
428 .long_name= "PAM (Portable AnyMap) image", 428 .long_name= "PAM (Portable AnyMap) image",
429 }; 429 };
430 #endif // CONFIG_PAM_ENCODER 430 #endif // CONFIG_PAM_ENCODER