comparison raw.c @ 4501:3e5b9c1a413e libavformat

Make format long_names consistent.
author diego
date Mon, 16 Feb 2009 01:55:28 +0000
parents 491a0b1d4f62
children 6d77b56e2b0e
comparison
equal deleted inserted replaced
4500:cc4b6d42dcd5 4501:3e5b9c1a413e
638 /* Note: Do not forget to add new entries to the Makefile as well. */ 638 /* Note: Do not forget to add new entries to the Makefile as well. */
639 639
640 #if CONFIG_AAC_DEMUXER 640 #if CONFIG_AAC_DEMUXER
641 AVInputFormat aac_demuxer = { 641 AVInputFormat aac_demuxer = {
642 "aac", 642 "aac",
643 NULL_IF_CONFIG_SMALL("ADTS AAC"), 643 NULL_IF_CONFIG_SMALL("raw ADTS AAC"),
644 0, 644 0,
645 adts_aac_probe, 645 adts_aac_probe,
646 audio_read_header, 646 audio_read_header,
647 raw_read_partial_packet, 647 raw_read_partial_packet,
648 .flags= AVFMT_GENERIC_INDEX, 648 .flags= AVFMT_GENERIC_INDEX,
825 #endif 825 #endif
826 826
827 #if CONFIG_GSM_DEMUXER 827 #if CONFIG_GSM_DEMUXER
828 AVInputFormat gsm_demuxer = { 828 AVInputFormat gsm_demuxer = {
829 "gsm", 829 "gsm",
830 NULL_IF_CONFIG_SMALL("GSM"), 830 NULL_IF_CONFIG_SMALL("raw GSM"),
831 0, 831 0,
832 NULL, 832 NULL,
833 audio_read_header, 833 audio_read_header,
834 raw_read_partial_packet, 834 raw_read_partial_packet,
835 .flags= AVFMT_GENERIC_INDEX, 835 .flags= AVFMT_GENERIC_INDEX,
926 #endif 926 #endif
927 927
928 #if CONFIG_INGENIENT_DEMUXER 928 #if CONFIG_INGENIENT_DEMUXER
929 AVInputFormat ingenient_demuxer = { 929 AVInputFormat ingenient_demuxer = {
930 "ingenient", 930 "ingenient",
931 NULL_IF_CONFIG_SMALL("Ingenient MJPEG"), 931 NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
932 0, 932 0,
933 NULL, 933 NULL,
934 video_read_header, 934 video_read_header,
935 ingenient_read_packet, 935 ingenient_read_packet,
936 .flags= AVFMT_GENERIC_INDEX, 936 .flags= AVFMT_GENERIC_INDEX,
969 #endif 969 #endif
970 970
971 #if CONFIG_MJPEG_DEMUXER 971 #if CONFIG_MJPEG_DEMUXER
972 AVInputFormat mjpeg_demuxer = { 972 AVInputFormat mjpeg_demuxer = {
973 "mjpeg", 973 "mjpeg",
974 NULL_IF_CONFIG_SMALL("MJPEG video"), 974 NULL_IF_CONFIG_SMALL("raw MJPEG video"),
975 0, 975 0,
976 NULL, 976 NULL,
977 video_read_header, 977 video_read_header,
978 raw_read_partial_packet, 978 raw_read_partial_packet,
979 .flags= AVFMT_GENERIC_INDEX, 979 .flags= AVFMT_GENERIC_INDEX,
983 #endif 983 #endif
984 984
985 #if CONFIG_MJPEG_MUXER 985 #if CONFIG_MJPEG_MUXER
986 AVOutputFormat mjpeg_muxer = { 986 AVOutputFormat mjpeg_muxer = {
987 "mjpeg", 987 "mjpeg",
988 NULL_IF_CONFIG_SMALL("MJPEG video"), 988 NULL_IF_CONFIG_SMALL("raw MJPEG video"),
989 "video/x-mjpeg", 989 "video/x-mjpeg",
990 "mjpg,mjpeg", 990 "mjpg,mjpeg",
991 0, 991 0,
992 CODEC_ID_NONE, 992 CODEC_ID_NONE,
993 CODEC_ID_MJPEG, 993 CODEC_ID_MJPEG,
1012 #endif 1012 #endif
1013 1013
1014 #if CONFIG_MPEG1VIDEO_MUXER 1014 #if CONFIG_MPEG1VIDEO_MUXER
1015 AVOutputFormat mpeg1video_muxer = { 1015 AVOutputFormat mpeg1video_muxer = {
1016 "mpeg1video", 1016 "mpeg1video",
1017 NULL_IF_CONFIG_SMALL("MPEG video"), 1017 NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
1018 "video/x-mpeg", 1018 "video/x-mpeg",
1019 "mpg,mpeg,m1v", 1019 "mpg,mpeg,m1v",
1020 0, 1020 0,
1021 CODEC_ID_NONE, 1021 CODEC_ID_NONE,
1022 CODEC_ID_MPEG1VIDEO, 1022 CODEC_ID_MPEG1VIDEO,
1027 #endif 1027 #endif
1028 1028
1029 #if CONFIG_MPEG2VIDEO_MUXER 1029 #if CONFIG_MPEG2VIDEO_MUXER
1030 AVOutputFormat mpeg2video_muxer = { 1030 AVOutputFormat mpeg2video_muxer = {
1031 "mpeg2video", 1031 "mpeg2video",
1032 NULL_IF_CONFIG_SMALL("MPEG-2 video"), 1032 NULL_IF_CONFIG_SMALL("raw MPEG-2 video"),
1033 NULL, 1033 NULL,
1034 "m2v", 1034 "m2v",
1035 0, 1035 0,
1036 CODEC_ID_NONE, 1036 CODEC_ID_NONE,
1037 CODEC_ID_MPEG2VIDEO, 1037 CODEC_ID_MPEG2VIDEO,
1042 #endif 1042 #endif
1043 1043
1044 #if CONFIG_MPEGVIDEO_DEMUXER 1044 #if CONFIG_MPEGVIDEO_DEMUXER
1045 AVInputFormat mpegvideo_demuxer = { 1045 AVInputFormat mpegvideo_demuxer = {
1046 "mpegvideo", 1046 "mpegvideo",
1047 NULL_IF_CONFIG_SMALL("MPEG video"), 1047 NULL_IF_CONFIG_SMALL("raw MPEG video"),
1048 0, 1048 0,
1049 mpegvideo_probe, 1049 mpegvideo_probe,
1050 video_read_header, 1050 video_read_header,
1051 raw_read_partial_packet, 1051 raw_read_partial_packet,
1052 .flags= AVFMT_GENERIC_INDEX, 1052 .flags= AVFMT_GENERIC_INDEX,
1055 #endif 1055 #endif
1056 1056
1057 #if CONFIG_NULL_MUXER 1057 #if CONFIG_NULL_MUXER
1058 AVOutputFormat null_muxer = { 1058 AVOutputFormat null_muxer = {
1059 "null", 1059 "null",
1060 NULL_IF_CONFIG_SMALL("null video format"), 1060 NULL_IF_CONFIG_SMALL("raw null video format"),
1061 NULL, 1061 NULL,
1062 NULL, 1062 NULL,
1063 0, 1063 0,
1064 #ifdef WORDS_BIGENDIAN 1064 #ifdef WORDS_BIGENDIAN
1065 CODEC_ID_PCM_S16BE, 1065 CODEC_ID_PCM_S16BE,
1104 1104
1105 #if CONFIG_ROQ_MUXER 1105 #if CONFIG_ROQ_MUXER
1106 AVOutputFormat roq_muxer = 1106 AVOutputFormat roq_muxer =
1107 { 1107 {
1108 "RoQ", 1108 "RoQ",
1109 NULL_IF_CONFIG_SMALL("id RoQ format"), 1109 NULL_IF_CONFIG_SMALL("raw id RoQ format"),
1110 NULL, 1110 NULL,
1111 "roq", 1111 "roq",
1112 0, 1112 0,
1113 CODEC_ID_ROQ_DPCM, 1113 CODEC_ID_ROQ_DPCM,
1114 CODEC_ID_ROQ, 1114 CODEC_ID_ROQ,