Mercurial > libavformat.hg

comparison raw.c @ 3726:514470f7afed libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Remove redundant #endif comments that are very close to the #ifdef condition. This will make upcoming diffs smaller.
author diego
date Fri, 15 Aug 2008 16:37:59 +0000
parents 900a232fc55e
children 9a307cfd59a3
comparison
equal deleted inserted replaced
3725:900a232fc55e 3726:514470f7afed
65 { 65 {
66 put_buffer(s->pb, pkt->data, pkt->size); 66 put_buffer(s->pb, pkt->data, pkt->size);
67 put_flush_packet(s->pb); 67 put_flush_packet(s->pb);
68 return 0; 68 return 0;
69 } 69 }
70 #endif //CONFIG_MUXERS 70 #endif
71 71
72 /* raw input */ 72 /* raw input */
73 static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap) 73 static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
74 { 74 {
75 AVStream *st; 75 AVStream *st;
539 CODEC_ID_NONE, 539 CODEC_ID_NONE,
540 NULL, 540 NULL,
541 raw_write_packet, 541 raw_write_packet,
542 .flags= AVFMT_NOTIMESTAMPS, 542 .flags= AVFMT_NOTIMESTAMPS,
543 }; 543 };
544 #endif //CONFIG_MUXERS 544 #endif
545 545
546 AVInputFormat dirac_demuxer = { 546 AVInputFormat dirac_demuxer = {
547 "dirac", 547 "dirac",
548 NULL_IF_CONFIG_SMALL("raw Dirac"), 548 NULL_IF_CONFIG_SMALL("raw Dirac"),
549 0, 549 0,
619 CODEC_ID_NONE, 619 CODEC_ID_NONE,
620 flac_write_header, 620 flac_write_header,
621 raw_write_packet, 621 raw_write_packet,
622 .flags= AVFMT_NOTIMESTAMPS, 622 .flags= AVFMT_NOTIMESTAMPS,
623 }; 623 };
624 #endif //CONFIG_MUXERS 624 #endif
625 625
626 AVInputFormat gsm_demuxer = { 626 AVInputFormat gsm_demuxer = {
627 "gsm", 627 "gsm",
628 NULL_IF_CONFIG_SMALL("GSM"), 628 NULL_IF_CONFIG_SMALL("GSM"),
629 0, 629 0,
658 CODEC_ID_H261, 658 CODEC_ID_H261,
659 NULL, 659 NULL,
660 raw_write_packet, 660 raw_write_packet,
661 .flags= AVFMT_NOTIMESTAMPS, 661 .flags= AVFMT_NOTIMESTAMPS,
662 }; 662 };
663 #endif //CONFIG_MUXERS 663 #endif
664 664
665 AVInputFormat h263_demuxer = { 665 AVInputFormat h263_demuxer = {
666 "h263", 666 "h263",
667 NULL_IF_CONFIG_SMALL("raw H.263"), 667 NULL_IF_CONFIG_SMALL("raw H.263"),
668 0, 668 0,
685 CODEC_ID_H263, 685 CODEC_ID_H263,
686 NULL, 686 NULL,
687 raw_write_packet, 687 raw_write_packet,
688 .flags= AVFMT_NOTIMESTAMPS, 688 .flags= AVFMT_NOTIMESTAMPS,
689 }; 689 };
690 #endif //CONFIG_MUXERS 690 #endif
691 691
692 AVInputFormat h264_demuxer = { 692 AVInputFormat h264_demuxer = {
693 "h264", 693 "h264",
694 NULL_IF_CONFIG_SMALL("raw H.264 video format"), 694 NULL_IF_CONFIG_SMALL("raw H.264 video format"),
695 0, 695 0,
712 CODEC_ID_H264, 712 CODEC_ID_H264,
713 NULL, 713 NULL,
714 raw_write_packet, 714 raw_write_packet,
715 .flags= AVFMT_NOTIMESTAMPS, 715 .flags= AVFMT_NOTIMESTAMPS,
716 }; 716 };
717 #endif //CONFIG_MUXERS 717 #endif
718 718
719 AVInputFormat ingenient_demuxer = { 719 AVInputFormat ingenient_demuxer = {
720 "ingenient", 720 "ingenient",
721 NULL_IF_CONFIG_SMALL("Ingenient MJPEG"), 721 NULL_IF_CONFIG_SMALL("Ingenient MJPEG"),
722 0, 722 0,
751 CODEC_ID_MPEG4, 751 CODEC_ID_MPEG4,
752 NULL, 752 NULL,
753 raw_write_packet, 753 raw_write_packet,
754 .flags= AVFMT_NOTIMESTAMPS, 754 .flags= AVFMT_NOTIMESTAMPS,
755 }; 755 };
756 #endif //CONFIG_MUXERS 756 #endif
757 757
758 AVInputFormat mjpeg_demuxer = { 758 AVInputFormat mjpeg_demuxer = {
759 "mjpeg", 759 "mjpeg",
760 NULL_IF_CONFIG_SMALL("MJPEG video"), 760 NULL_IF_CONFIG_SMALL("MJPEG video"),
761 0, 761 0,
778 CODEC_ID_MJPEG, 778 CODEC_ID_MJPEG,
779 NULL, 779 NULL,
780 raw_write_packet, 780 raw_write_packet,
781 .flags= AVFMT_NOTIMESTAMPS, 781 .flags= AVFMT_NOTIMESTAMPS,
782 }; 782 };
783 #endif //CONFIG_MUXERS 783 #endif
784 784
785 AVInputFormat mlp_demuxer = { 785 AVInputFormat mlp_demuxer = {
786 "mlp", 786 "mlp",
787 NULL_IF_CONFIG_SMALL("raw MLP"), 787 NULL_IF_CONFIG_SMALL("raw MLP"),
788 0, 788 0,
805 CODEC_ID_MPEG1VIDEO, 805 CODEC_ID_MPEG1VIDEO,
806 NULL, 806 NULL,
807 raw_write_packet, 807 raw_write_packet,
808 .flags= AVFMT_NOTIMESTAMPS, 808 .flags= AVFMT_NOTIMESTAMPS,
809 }; 809 };
810 #endif //CONFIG_MUXERS 810 #endif
811 811
812 #ifdef CONFIG_MUXERS 812 #ifdef CONFIG_MUXERS
813 AVOutputFormat mpeg2video_muxer = { 813 AVOutputFormat mpeg2video_muxer = {
814 "mpeg2video", 814 "mpeg2video",
815 NULL_IF_CONFIG_SMALL("MPEG-2 video"), 815 NULL_IF_CONFIG_SMALL("MPEG-2 video"),
820 CODEC_ID_MPEG2VIDEO, 820 CODEC_ID_MPEG2VIDEO,
821 NULL, 821 NULL,
822 raw_write_packet, 822 raw_write_packet,
823 .flags= AVFMT_NOTIMESTAMPS, 823 .flags= AVFMT_NOTIMESTAMPS,
824 }; 824 };
825 #endif //CONFIG_MUXERS 825 #endif
826 826
827 AVInputFormat mpegvideo_demuxer = { 827 AVInputFormat mpegvideo_demuxer = {
828 "mpegvideo", 828 "mpegvideo",
829 NULL_IF_CONFIG_SMALL("MPEG video"), 829 NULL_IF_CONFIG_SMALL("MPEG video"),
830 0, 830 0,
850 CODEC_ID_RAWVIDEO, 850 CODEC_ID_RAWVIDEO,
851 NULL, 851 NULL,
852 null_write_packet, 852 null_write_packet,
853 .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS, 853 .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
854 }; 854 };
855 #endif //CONFIG_MUXERS 855 #endif
856 856
857 AVInputFormat rawvideo_demuxer = { 857 AVInputFormat rawvideo_demuxer = {
858 "rawvideo", 858 "rawvideo",
859 NULL_IF_CONFIG_SMALL("raw video format"), 859 NULL_IF_CONFIG_SMALL("raw video format"),
860 0, 860 0,
877 CODEC_ID_RAWVIDEO, 877 CODEC_ID_RAWVIDEO,
878 NULL, 878 NULL,
879 raw_write_packet, 879 raw_write_packet,
880 .flags= AVFMT_NOTIMESTAMPS, 880 .flags= AVFMT_NOTIMESTAMPS,
881 }; 881 };
882 #endif //CONFIG_MUXERS 882 #endif
883 883
884 #ifdef CONFIG_ROQ_MUXER 884 #ifdef CONFIG_ROQ_MUXER
885 AVOutputFormat roq_muxer = 885 AVOutputFormat roq_muxer =
886 { 886 {
887 "RoQ", 887 "RoQ",
892 CODEC_ID_ROQ_DPCM, 892 CODEC_ID_ROQ_DPCM,
893 CODEC_ID_ROQ, 893 CODEC_ID_ROQ,
894 roq_write_header, 894 roq_write_header,
895 raw_write_packet, 895 raw_write_packet,
896 }; 896 };
897 #endif //CONFIG_ROQ_MUXER 897 #endif
898 898
899 AVInputFormat shorten_demuxer = { 899 AVInputFormat shorten_demuxer = {
900 "shn", 900 "shn",
901 NULL_IF_CONFIG_SMALL("raw Shorten"), 901 NULL_IF_CONFIG_SMALL("raw Shorten"),
902 0, 902 0,