Mercurial > libavformat.hg
comparison raw.c @ 3727:9a307cfd59a3 libavformat
Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
declarations by more specific CONFIG_FOOBAR_MUXER conditions.
author | diego |
---|---|
date | Fri, 15 Aug 2008 16:48:05 +0000 |
parents | 514470f7afed |
children | 83ddeeaae767 |
comparison
equal
deleted
inserted
replaced
3726:514470f7afed | 3727:9a307cfd59a3 |
---|---|
526 .extensions = "ac3", | 526 .extensions = "ac3", |
527 .value = CODEC_ID_AC3, | 527 .value = CODEC_ID_AC3, |
528 }; | 528 }; |
529 #endif | 529 #endif |
530 | 530 |
531 #ifdef CONFIG_MUXERS | 531 #ifdef CONFIG_AC3_MUXER |
532 AVOutputFormat ac3_muxer = { | 532 AVOutputFormat ac3_muxer = { |
533 "ac3", | 533 "ac3", |
534 NULL_IF_CONFIG_SMALL("raw AC-3"), | 534 NULL_IF_CONFIG_SMALL("raw AC-3"), |
535 "audio/x-ac3", | 535 "audio/x-ac3", |
536 "ac3", | 536 "ac3", |
552 raw_read_partial_packet, | 552 raw_read_partial_packet, |
553 .flags= AVFMT_GENERIC_INDEX, | 553 .flags= AVFMT_GENERIC_INDEX, |
554 .value = CODEC_ID_DIRAC, | 554 .value = CODEC_ID_DIRAC, |
555 }; | 555 }; |
556 | 556 |
557 #ifdef CONFIG_MUXERS | 557 #ifdef CONFIG_DIRAC_MUXER |
558 AVOutputFormat dirac_muxer = { | 558 AVOutputFormat dirac_muxer = { |
559 "dirac", | 559 "dirac", |
560 NULL_IF_CONFIG_SMALL("raw Dirac"), | 560 NULL_IF_CONFIG_SMALL("raw Dirac"), |
561 NULL, | 561 NULL, |
562 "drc", | 562 "drc", |
579 .flags= AVFMT_GENERIC_INDEX, | 579 .flags= AVFMT_GENERIC_INDEX, |
580 .extensions = "dts", | 580 .extensions = "dts", |
581 .value = CODEC_ID_DTS, | 581 .value = CODEC_ID_DTS, |
582 }; | 582 }; |
583 | 583 |
584 #ifdef CONFIG_MUXERS | 584 #ifdef CONFIG_DTS_MUXER |
585 AVOutputFormat dts_muxer = { | 585 AVOutputFormat dts_muxer = { |
586 "dts", | 586 "dts", |
587 NULL_IF_CONFIG_SMALL("raw DTS"), | 587 NULL_IF_CONFIG_SMALL("raw DTS"), |
588 "audio/x-dca", | 588 "audio/x-dca", |
589 "dts", | 589 "dts", |
606 .flags= AVFMT_GENERIC_INDEX, | 606 .flags= AVFMT_GENERIC_INDEX, |
607 .extensions = "flac", | 607 .extensions = "flac", |
608 .value = CODEC_ID_FLAC, | 608 .value = CODEC_ID_FLAC, |
609 }; | 609 }; |
610 | 610 |
611 #ifdef CONFIG_MUXERS | 611 #ifdef CONFIG_FLAC_MUXER |
612 AVOutputFormat flac_muxer = { | 612 AVOutputFormat flac_muxer = { |
613 "flac", | 613 "flac", |
614 NULL_IF_CONFIG_SMALL("raw FLAC"), | 614 NULL_IF_CONFIG_SMALL("raw FLAC"), |
615 "audio/x-flac", | 615 "audio/x-flac", |
616 "flac", | 616 "flac", |
645 .flags= AVFMT_GENERIC_INDEX, | 645 .flags= AVFMT_GENERIC_INDEX, |
646 .extensions = "h261", | 646 .extensions = "h261", |
647 .value = CODEC_ID_H261, | 647 .value = CODEC_ID_H261, |
648 }; | 648 }; |
649 | 649 |
650 #ifdef CONFIG_MUXERS | 650 #ifdef CONFIG_H261_MUXER |
651 AVOutputFormat h261_muxer = { | 651 AVOutputFormat h261_muxer = { |
652 "h261", | 652 "h261", |
653 NULL_IF_CONFIG_SMALL("raw H.261"), | 653 NULL_IF_CONFIG_SMALL("raw H.261"), |
654 "video/x-h261", | 654 "video/x-h261", |
655 "h261", | 655 "h261", |
672 .flags= AVFMT_GENERIC_INDEX, | 672 .flags= AVFMT_GENERIC_INDEX, |
673 // .extensions = "h263", //FIXME remove after writing mpeg4_probe | 673 // .extensions = "h263", //FIXME remove after writing mpeg4_probe |
674 .value = CODEC_ID_H263, | 674 .value = CODEC_ID_H263, |
675 }; | 675 }; |
676 | 676 |
677 #ifdef CONFIG_MUXERS | 677 #ifdef CONFIG_H263_MUXER |
678 AVOutputFormat h263_muxer = { | 678 AVOutputFormat h263_muxer = { |
679 "h263", | 679 "h263", |
680 NULL_IF_CONFIG_SMALL("raw H.263"), | 680 NULL_IF_CONFIG_SMALL("raw H.263"), |
681 "video/x-h263", | 681 "video/x-h263", |
682 "h263", | 682 "h263", |
699 .flags= AVFMT_GENERIC_INDEX, | 699 .flags= AVFMT_GENERIC_INDEX, |
700 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe | 700 .extensions = "h26l,h264,264", //FIXME remove after writing mpeg4_probe |
701 .value = CODEC_ID_H264, | 701 .value = CODEC_ID_H264, |
702 }; | 702 }; |
703 | 703 |
704 #ifdef CONFIG_MUXERS | 704 #ifdef CONFIG_H264_MUXER |
705 AVOutputFormat h264_muxer = { | 705 AVOutputFormat h264_muxer = { |
706 "h264", | 706 "h264", |
707 NULL_IF_CONFIG_SMALL("raw H.264 video format"), | 707 NULL_IF_CONFIG_SMALL("raw H.264 video format"), |
708 NULL, | 708 NULL, |
709 "h264", | 709 "h264", |
738 .flags= AVFMT_GENERIC_INDEX, | 738 .flags= AVFMT_GENERIC_INDEX, |
739 .extensions = "m4v", //FIXME remove after writing mpeg4_probe | 739 .extensions = "m4v", //FIXME remove after writing mpeg4_probe |
740 .value = CODEC_ID_MPEG4, | 740 .value = CODEC_ID_MPEG4, |
741 }; | 741 }; |
742 | 742 |
743 #ifdef CONFIG_MUXERS | 743 #ifdef CONFIG_M4V_MUXER |
744 AVOutputFormat m4v_muxer = { | 744 AVOutputFormat m4v_muxer = { |
745 "m4v", | 745 "m4v", |
746 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), | 746 NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), |
747 NULL, | 747 NULL, |
748 "m4v", | 748 "m4v", |
765 .flags= AVFMT_GENERIC_INDEX, | 765 .flags= AVFMT_GENERIC_INDEX, |
766 .extensions = "mjpg,mjpeg", | 766 .extensions = "mjpg,mjpeg", |
767 .value = CODEC_ID_MJPEG, | 767 .value = CODEC_ID_MJPEG, |
768 }; | 768 }; |
769 | 769 |
770 #ifdef CONFIG_MUXERS | 770 #ifdef CONFIG_MJPEG_MUXER |
771 AVOutputFormat mjpeg_muxer = { | 771 AVOutputFormat mjpeg_muxer = { |
772 "mjpeg", | 772 "mjpeg", |
773 NULL_IF_CONFIG_SMALL("MJPEG video"), | 773 NULL_IF_CONFIG_SMALL("MJPEG video"), |
774 "video/x-mjpeg", | 774 "video/x-mjpeg", |
775 "mjpg,mjpeg", | 775 "mjpg,mjpeg", |
792 .flags= AVFMT_GENERIC_INDEX, | 792 .flags= AVFMT_GENERIC_INDEX, |
793 .extensions = "mlp", | 793 .extensions = "mlp", |
794 .value = CODEC_ID_MLP, | 794 .value = CODEC_ID_MLP, |
795 }; | 795 }; |
796 | 796 |
797 #ifdef CONFIG_MUXERS | 797 #ifdef CONFIG_MPEG1VIDEO_MUXER |
798 AVOutputFormat mpeg1video_muxer = { | 798 AVOutputFormat mpeg1video_muxer = { |
799 "mpeg1video", | 799 "mpeg1video", |
800 NULL_IF_CONFIG_SMALL("MPEG video"), | 800 NULL_IF_CONFIG_SMALL("MPEG video"), |
801 "video/x-mpeg", | 801 "video/x-mpeg", |
802 "mpg,mpeg,m1v", | 802 "mpg,mpeg,m1v", |
807 raw_write_packet, | 807 raw_write_packet, |
808 .flags= AVFMT_NOTIMESTAMPS, | 808 .flags= AVFMT_NOTIMESTAMPS, |
809 }; | 809 }; |
810 #endif | 810 #endif |
811 | 811 |
812 #ifdef CONFIG_MUXERS | 812 #ifdef CONFIG_MPEG2VIDEO_MUXER |
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"), |
816 NULL, | 816 NULL, |
817 "m2v", | 817 "m2v", |
833 raw_read_partial_packet, | 833 raw_read_partial_packet, |
834 .flags= AVFMT_GENERIC_INDEX, | 834 .flags= AVFMT_GENERIC_INDEX, |
835 .value = CODEC_ID_MPEG1VIDEO, | 835 .value = CODEC_ID_MPEG1VIDEO, |
836 }; | 836 }; |
837 | 837 |
838 #ifdef CONFIG_MUXERS | 838 #ifdef CONFIG_NULL_MUXER |
839 AVOutputFormat null_muxer = { | 839 AVOutputFormat null_muxer = { |
840 "null", | 840 "null", |
841 NULL_IF_CONFIG_SMALL("null video format"), | 841 NULL_IF_CONFIG_SMALL("null video format"), |
842 NULL, | 842 NULL, |
843 NULL, | 843 NULL, |
864 .flags= AVFMT_GENERIC_INDEX, | 864 .flags= AVFMT_GENERIC_INDEX, |
865 .extensions = "yuv,cif,qcif,rgb", | 865 .extensions = "yuv,cif,qcif,rgb", |
866 .value = CODEC_ID_RAWVIDEO, | 866 .value = CODEC_ID_RAWVIDEO, |
867 }; | 867 }; |
868 | 868 |
869 #ifdef CONFIG_MUXERS | 869 #ifdef CONFIG_RAWVIDEO_MUXER |
870 AVOutputFormat rawvideo_muxer = { | 870 AVOutputFormat rawvideo_muxer = { |
871 "rawvideo", | 871 "rawvideo", |
872 NULL_IF_CONFIG_SMALL("raw video format"), | 872 NULL_IF_CONFIG_SMALL("raw video format"), |
873 NULL, | 873 NULL, |
874 "yuv,rgb", | 874 "yuv,rgb", |