comparison raw.c @ 3289:811c78fac294 libavformat

Replace some occurrences of 0 with CODEC_ID_NONE. Fixes icc warning #188: enumerated type mixed with another type
author cehoyos
date Mon, 12 May 2008 10:30:40 +0000
parents 6f61c3b36632
children 9e77f940abc4
comparison
equal deleted inserted replaced
3288:b8f57813338a 3289:811c78fac294
461 "raw flac", 461 "raw flac",
462 "audio/x-flac", 462 "audio/x-flac",
463 "flac", 463 "flac",
464 0, 464 0,
465 CODEC_ID_FLAC, 465 CODEC_ID_FLAC,
466 0, 466 CODEC_ID_NONE,
467 flac_write_header, 467 flac_write_header,
468 raw_write_packet, 468 raw_write_packet,
469 .flags= AVFMT_NOTIMESTAMPS, 469 .flags= AVFMT_NOTIMESTAMPS,
470 }; 470 };
471 #endif //CONFIG_MUXERS 471 #endif //CONFIG_MUXERS
491 "raw ac3", 491 "raw ac3",
492 "audio/x-ac3", 492 "audio/x-ac3",
493 "ac3", 493 "ac3",
494 0, 494 0,
495 CODEC_ID_AC3, 495 CODEC_ID_AC3,
496 0, 496 CODEC_ID_NONE,
497 NULL, 497 NULL,
498 raw_write_packet, 498 raw_write_packet,
499 .flags= AVFMT_NOTIMESTAMPS, 499 .flags= AVFMT_NOTIMESTAMPS,
500 }; 500 };
501 501
504 "raw dts", 504 "raw dts",
505 "audio/x-dca", 505 "audio/x-dca",
506 "dts", 506 "dts",
507 0, 507 0,
508 CODEC_ID_DTS, 508 CODEC_ID_DTS,
509 0, 509 CODEC_ID_NONE,
510 NULL, 510 NULL,
511 raw_write_packet, 511 raw_write_packet,
512 .flags= AVFMT_NOTIMESTAMPS, 512 .flags= AVFMT_NOTIMESTAMPS,
513 }; 513 };
514 514
531 "dirac", 531 "dirac",
532 "raw dirac", 532 "raw dirac",
533 NULL, 533 NULL,
534 "drc", 534 "drc",
535 0, 535 0,
536 0, 536 CODEC_ID_NONE,
537 CODEC_ID_DIRAC, 537 CODEC_ID_DIRAC,
538 NULL, 538 NULL,
539 raw_write_packet, 539 raw_write_packet,
540 .flags= AVFMT_NOTIMESTAMPS, 540 .flags= AVFMT_NOTIMESTAMPS,
541 }; 541 };
613 "h261", 613 "h261",
614 "raw h261", 614 "raw h261",
615 "video/x-h261", 615 "video/x-h261",
616 "h261", 616 "h261",
617 0, 617 0,
618 0, 618 CODEC_ID_NONE,
619 CODEC_ID_H261, 619 CODEC_ID_H261,
620 NULL, 620 NULL,
621 raw_write_packet, 621 raw_write_packet,
622 .flags= AVFMT_NOTIMESTAMPS, 622 .flags= AVFMT_NOTIMESTAMPS,
623 }; 623 };
641 "h263", 641 "h263",
642 "raw h263", 642 "raw h263",
643 "video/x-h263", 643 "video/x-h263",
644 "h263", 644 "h263",
645 0, 645 0,
646 0, 646 CODEC_ID_NONE,
647 CODEC_ID_H263, 647 CODEC_ID_H263,
648 NULL, 648 NULL,
649 raw_write_packet, 649 raw_write_packet,
650 .flags= AVFMT_NOTIMESTAMPS, 650 .flags= AVFMT_NOTIMESTAMPS,
651 }; 651 };
724 "mpeg1video", 724 "mpeg1video",
725 "MPEG video", 725 "MPEG video",
726 "video/x-mpeg", 726 "video/x-mpeg",
727 "mpg,mpeg,m1v", 727 "mpg,mpeg,m1v",
728 0, 728 0,
729 0, 729 CODEC_ID_NONE,
730 CODEC_ID_MPEG1VIDEO, 730 CODEC_ID_MPEG1VIDEO,
731 NULL, 731 NULL,
732 raw_write_packet, 732 raw_write_packet,
733 .flags= AVFMT_NOTIMESTAMPS, 733 .flags= AVFMT_NOTIMESTAMPS,
734 }; 734 };
739 "mpeg2video", 739 "mpeg2video",
740 "MPEG2 video", 740 "MPEG2 video",
741 NULL, 741 NULL,
742 "m2v", 742 "m2v",
743 0, 743 0,
744 0, 744 CODEC_ID_NONE,
745 CODEC_ID_MPEG2VIDEO, 745 CODEC_ID_MPEG2VIDEO,
746 NULL, 746 NULL,
747 raw_write_packet, 747 raw_write_packet,
748 .flags= AVFMT_NOTIMESTAMPS, 748 .flags= AVFMT_NOTIMESTAMPS,
749 }; 749 };
780 "mjpeg", 780 "mjpeg",
781 "MJPEG video", 781 "MJPEG video",
782 "video/x-mjpeg", 782 "video/x-mjpeg",
783 "mjpg,mjpeg", 783 "mjpg,mjpeg",
784 0, 784 0,
785 0, 785 CODEC_ID_NONE,
786 CODEC_ID_MJPEG, 786 CODEC_ID_MJPEG,
787 NULL, 787 NULL,
788 raw_write_packet, 788 raw_write_packet,
789 .flags= AVFMT_NOTIMESTAMPS, 789 .flags= AVFMT_NOTIMESTAMPS,
790 }; 790 };
825 long_name,\ 825 long_name,\
826 NULL,\ 826 NULL,\
827 ext,\ 827 ext,\
828 0,\ 828 0,\
829 codec,\ 829 codec,\
830 0,\ 830 CODEC_ID_NONE,\
831 NULL,\ 831 NULL,\
832 raw_write_packet,\ 832 raw_write_packet,\
833 .flags= AVFMT_NOTIMESTAMPS,\ 833 .flags= AVFMT_NOTIMESTAMPS,\
834 }; 834 };
835 835