diff options
102 files changed, 172 insertions, 162 deletions
diff --git a/libavdevice/audio.c b/libavdevice/audio.c index 6be3ce1037..4fcd3afea0 100644 --- a/libavdevice/audio.c +++ b/libavdevice/audio.c @@ -315,7 +315,7 @@ static int audio_read_close(AVFormatContext *s1) #ifdef CONFIG_OSS_DEMUXER AVInputFormat oss_demuxer = { "oss", - "audio grab and output", + NULL_IF_CONFIG_SMALL("audio grab and output"), sizeof(AudioData), NULL, audio_read_header, @@ -328,7 +328,7 @@ AVInputFormat oss_demuxer = { #ifdef CONFIG_OSS_MUXER AVOutputFormat oss_muxer = { "oss", - "audio grab and output", + NULL_IF_CONFIG_SMALL("audio grab and output"), "", "", sizeof(AudioData), diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index 364e296658..7b37f11159 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -311,7 +311,7 @@ static int grab_read_close(AVFormatContext *s1) AVInputFormat bktr_demuxer = { "bktr", - "video grab", + NULL_IF_CONFIG_SMALL("video grab"), sizeof(VideoData), NULL, grab_read_header, diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c index 8562652e93..56e61223e6 100644 --- a/libavdevice/dv1394.c +++ b/libavdevice/dv1394.c @@ -228,7 +228,7 @@ static int dv1394_close(AVFormatContext * context) AVInputFormat dv1394_demuxer = { .name = "dv1394", - .long_name = "dv1394 A/V grab", + .long_name = NULL_IF_CONFIG_SMALL("DV1394 A/V grab"), .priv_data_size = sizeof(struct dv1394_data), .read_header = dv1394_read_header, .read_packet = dv1394_read_packet, diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 7be079e937..1457d8c81a 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -350,7 +350,7 @@ static int dc1394_v2_close(AVFormatContext * context) AVInputFormat libdc1394_demuxer = { .name = "libdc1394", - .long_name = "dc1394 v.2 A/V grab", + .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.2 A/V grab"), .priv_data_size = sizeof(struct dc1394_data), .read_header = dc1394_v2_read_header, .read_packet = dc1394_v2_read_packet, @@ -362,7 +362,7 @@ AVInputFormat libdc1394_demuxer = { #if ENABLE_LIBDC1394_1 AVInputFormat libdc1394_demuxer = { .name = "libdc1394", - .long_name = "dc1394 v.1 A/V grab", + .long_name = NULL_IF_CONFIG_SMALL("dc1394 v.1 A/V grab"), .priv_data_size = sizeof(struct dc1394_data), .read_header = dc1394_v1_read_header, .read_packet = dc1394_v1_read_packet, diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 20dd53bc32..2f7fc6a1b8 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -346,7 +346,7 @@ static int grab_read_close(AVFormatContext *s1) AVInputFormat v4l_demuxer = { "video4linux", - "video grab", + NULL_IF_CONFIG_SMALL("video grab"), sizeof(VideoData), NULL, grab_read_header, diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 95eea3cd92..de5bf78ca5 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -635,7 +635,7 @@ static int v4l2_read_close(AVFormatContext *s1) AVInputFormat v4l2_demuxer = { "video4linux2", - "video grab", + NULL_IF_CONFIG_SMALL("video grab"), sizeof(struct video_data), NULL, v4l2_read_header, diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 5963e6242e..be6003a422 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -456,7 +456,7 @@ static int vfw_read_close(AVFormatContext *s) AVInputFormat vfwcap_demuxer = { "vfwcap", - "VFW video capture", + NULL_IF_CONFIG_SMALL("VFW video capture"), sizeof(struct vfw_ctx), NULL, vfw_read_header, diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index f1375f6deb..4e1a49943a 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -519,7 +519,7 @@ x11grab_read_close(AVFormatContext *s1) AVInputFormat x11_grab_device_demuxer = { "x11grab", - "X11grab", + NULL_IF_CONFIG_SMALL("X11grab"), sizeof(x11_grab_t), NULL, x11grab_read_header, diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 151e9c9c81..25c2080d7f 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -328,7 +328,7 @@ static int fourxm_read_close(AVFormatContext *s) AVInputFormat fourxm_demuxer = { "4xm", - "4X Technologies format", + NULL_IF_CONFIG_SMALL("4X Technologies format"), sizeof(FourxmDemuxContext), fourxm_probe, fourxm_read_header, diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 0961b0fac3..5c65d361d2 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -107,7 +107,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt) AVOutputFormat adts_muxer = { "adts", - "ADTS AAC", + NULL_IF_CONFIG_SMALL("ADTS AAC"), "audio/aac", "aac", sizeof(ADTSContext), diff --git a/libavformat/aiff.c b/libavformat/aiff.c index 55c47dd0ad..4c701fb383 100644 --- a/libavformat/aiff.c +++ b/libavformat/aiff.c @@ -442,7 +442,7 @@ static int aiff_read_seek(AVFormatContext *s, #ifdef CONFIG_AIFF_DEMUXER AVInputFormat aiff_demuxer = { "aiff", - "Audio IFF", + NULL_IF_CONFIG_SMALL("Audio IFF"), 0, aiff_probe, aiff_read_header, @@ -456,7 +456,7 @@ AVInputFormat aiff_demuxer = { #ifdef CONFIG_AIFF_MUXER AVOutputFormat aiff_muxer = { "aiff", - "Audio IFF", + NULL_IF_CONFIG_SMALL("Audio IFF"), "audio/aiff", "aif,aiff,afc,aifc", sizeof(AIFFOutputContext), diff --git a/libavformat/amr.c b/libavformat/amr.c index d8c5399e3f..edf8f8d7d0 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -169,7 +169,7 @@ static int amr_read_packet(AVFormatContext *s, #ifdef CONFIG_AMR_DEMUXER AVInputFormat amr_demuxer = { "amr", - "3gpp amr file format", + NULL_IF_CONFIG_SMALL("3GPP AMR file format"), 0, /*priv_data_size*/ amr_probe, amr_read_header, @@ -181,7 +181,7 @@ AVInputFormat amr_demuxer = { #ifdef CONFIG_AMR_MUXER AVOutputFormat amr_muxer = { "amr", - "3gpp amr file format", + NULL_IF_CONFIG_SMALL("3GPP AMR file format"), "audio/amr", "amr", 0, diff --git a/libavformat/apc.c b/libavformat/apc.c index 2e102a6ad7..20de1c7e58 100644 --- a/libavformat/apc.c +++ b/libavformat/apc.c @@ -82,7 +82,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat apc_demuxer = { "apc", - "CRYO APC format", + NULL_IF_CONFIG_SMALL("CRYO APC format"), 0, apc_probe, apc_read_header, diff --git a/libavformat/ape.c b/libavformat/ape.c index 9d7ee6edc8..4c5d0461e2 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -511,7 +511,7 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp AVInputFormat ape_demuxer = { "ape", - "Monkey's Audio", + NULL_IF_CONFIG_SMALL("Monkey's Audio"), sizeof(APEContext), ape_probe, ape_read_header, diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c index 6bd89f4e1e..1817db044b 100644 --- a/libavformat/asf-enc.c +++ b/libavformat/asf-enc.c @@ -815,7 +815,7 @@ static int asf_write_trailer(AVFormatContext *s) #ifdef CONFIG_ASF_MUXER AVOutputFormat asf_muxer = { "asf", - "asf format", + NULL_IF_CONFIG_SMALL("ASF format"), "video/x-ms-asf", "asf,wmv,wma", sizeof(ASFContext), @@ -836,7 +836,7 @@ AVOutputFormat asf_muxer = { #ifdef CONFIG_ASF_STREAM_MUXER AVOutputFormat asf_stream_muxer = { "asf_stream", - "asf format", + NULL_IF_CONFIG_SMALL("ASF format"), "video/x-ms-asf", "asf,wmv,wma", sizeof(ASFContext), diff --git a/libavformat/asf.c b/libavformat/asf.c index 20fe917900..040ac7c6b2 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -1094,7 +1094,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int AVInputFormat asf_demuxer = { "asf", - "asf format", + NULL_IF_CONFIG_SMALL("ASF format"), sizeof(ASFContext), asf_probe, asf_read_header, diff --git a/libavformat/au.c b/libavformat/au.c index c6d5026e95..0a6594b574 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -180,7 +180,7 @@ static int au_read_close(AVFormatContext *s) #ifdef CONFIG_AU_DEMUXER AVInputFormat au_demuxer = { "au", - "SUN AU Format", + NULL_IF_CONFIG_SMALL("SUN AU format"), 0, au_probe, au_read_header, @@ -194,7 +194,7 @@ AVInputFormat au_demuxer = { #ifdef CONFIG_AU_MUXER AVOutputFormat au_muxer = { "au", - "SUN AU Format", + NULL_IF_CONFIG_SMALL("SUN AU format"), "audio/basic", "au", 0, diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f8f35ac37d..181a174392 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -185,6 +185,11 @@ typedef struct AVFormatParameters { typedef struct AVOutputFormat { const char *name; + /** + * Descriptive name for the format, meant to be more human-readable + * than \p name. You \e should use the NULL_IF_CONFIG_SMALL() macro + * to define it. + */ const char *long_name; const char *mime_type; const char *extensions; /**< comma separated filename extensions */ @@ -216,6 +221,11 @@ typedef struct AVOutputFormat { typedef struct AVInputFormat { const char *name; + /** + * Descriptive name for the format, meant to be more human-readable + * than \p name. You \e should use the NULL_IF_CONFIG_SMALL() macro + * to define it. + */ const char *long_name; /** size of private data so that it can be allocated in the wrapper */ int priv_data_size; diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 06576c313c..257dc3188b 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1087,7 +1087,7 @@ static int avi_probe(AVProbeData *p) AVInputFormat avi_demuxer = { "avi", - "avi format", + NULL_IF_CONFIG_SMALL("AVI format"), sizeof(AVIContext), avi_probe, avi_read_header, diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 35fee28ed4..63ada5d35a 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -593,7 +593,7 @@ static int avi_write_trailer(AVFormatContext *s) AVOutputFormat avi_muxer = { "avi", - "avi format", + NULL_IF_CONFIG_SMALL("AVI format"), "video/x-msvideo", "avi", sizeof(AVIContext), diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 158cac1fcd..fdb8efa765 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -209,7 +209,7 @@ static int avisynth_read_seek(AVFormatContext *s, int stream_index, int64_t pts, AVInputFormat avisynth_demuxer = { "avs", - "AVISynth", + NULL_IF_CONFIG_SMALL("AVISynth"), sizeof(AVISynthContext), NULL, avisynth_read_header, diff --git a/libavformat/avs.c b/libavformat/avs.c index 1a493cf797..16be4dc617 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -217,7 +217,7 @@ static int avs_read_close(AVFormatContext * s) AVInputFormat avs_demuxer = { "avs", - "avs format", + NULL_IF_CONFIG_SMALL("AVS format"), sizeof(avs_format_t), avs_probe, avs_read_header, diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index a69b880453..e3024c22b8 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -225,7 +225,7 @@ static int vid_read_packet(AVFormatContext *s, AVInputFormat bethsoftvid_demuxer = { "bethsoftvid", - "Bethesda Softworks 'Daggerfall' VID format", + NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"), sizeof(BVID_DemuxContext), vid_probe, vid_read_header, diff --git a/libavformat/bfi.c b/libavformat/bfi.c index 67cd1fe329..5a8d56919d 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -159,7 +159,7 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt) AVInputFormat bfi_demuxer = { "bfi", - "Brute Force & Ignorance", + NULL_IF_CONFIG_SMALL("Brute Force & Ignorance"), sizeof(BFIContext), bfi_probe, bfi_read_header, diff --git a/libavformat/c93.c b/libavformat/c93.c index 996012f6ed..be1577b8c8 100644 --- a/libavformat/c93.c +++ b/libavformat/c93.c @@ -190,7 +190,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat c93_demuxer = { "c93", - "Interplay C93", + NULL_IF_CONFIG_SMALL("Interplay C93"), sizeof(C93DemuxContext), probe, read_header, diff --git a/libavformat/crcenc.c b/libavformat/crcenc.c index 3ed0cdb450..a709c955d9 100644 --- a/libavformat/crcenc.c +++ b/libavformat/crcenc.c @@ -56,7 +56,7 @@ static int crc_write_trailer(struct AVFormatContext *s) AVOutputFormat crc_muxer = { "crc", - "crc testing format", + NULL_IF_CONFIG_SMALL("CRC testing format"), NULL, "", sizeof(CRCState), diff --git a/libavformat/daud.c b/libavformat/daud.c index 25989773a1..5f04e7aaee 100644 --- a/libavformat/daud.c +++ b/libavformat/daud.c @@ -49,7 +49,7 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) { AVInputFormat daud_demuxer = { "daud", - "D-Cinema audio format", + NULL_IF_CONFIG_SMALL("D-Cinema audio format"), 0, NULL, daud_header, diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index 14f2be8af5..eef205cf55 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -213,7 +213,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat dsicin_demuxer = { "dsicin", - "Delphine Software International CIN format", + NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"), sizeof(CinDemuxContext), cin_probe, cin_read_header, diff --git a/libavformat/dv.c b/libavformat/dv.c index c9b9546ec0..2f9171789b 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -440,7 +440,7 @@ static int dv_read_close(AVFormatContext *s) #ifdef CONFIG_DV_DEMUXER AVInputFormat dv_demuxer = { "dv", - "DV video format", + NULL_IF_CONFIG_SMALL("DV video format"), sizeof(RawDVContext), NULL, dv_read_header, diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 0b27295fd7..845b851292 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -402,7 +402,7 @@ static int dv_write_trailer(struct AVFormatContext *s) #ifdef CONFIG_DV_MUXER AVOutputFormat dv_muxer = { "dv", - "DV video format", + NULL_IF_CONFIG_SMALL("DV video format"), NULL, "dv", sizeof(DVMuxContext), diff --git a/libavformat/dxa.c b/libavformat/dxa.c index 2df73c7ddc..18fb5296cb 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -204,7 +204,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat dxa_demuxer = { "dxa", - "dxa", + NULL_IF_CONFIG_SMALL("DXA"), sizeof(DXAContext), dxa_probe, dxa_read_header, diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c index ffaf85e0eb..6c021efea4 100644 --- a/libavformat/eacdata.c +++ b/libavformat/eacdata.c @@ -91,7 +91,7 @@ static int cdata_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ea_cdata_demuxer = { "ea_cdata", - "Electronic Arts cdata", + NULL_IF_CONFIG_SMALL("Electronic Arts cdata"), sizeof(CdataDemuxContext), cdata_probe, cdata_read_header, diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index cc6c9f09c4..0b1f017b6e 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -465,7 +465,7 @@ static int ea_read_packet(AVFormatContext *s, AVInputFormat ea_demuxer = { "ea", - "Electronic Arts Multimedia Format", + NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"), sizeof(EaDemuxContext), ea_probe, ea_read_header, diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 97cd1292a6..70fb5d0a8a 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -480,7 +480,7 @@ static int ffm_probe(AVProbeData *p) AVInputFormat ffm_demuxer = { "ffm", - "ffm format", + NULL_IF_CONFIG_SMALL("ffm format"), sizeof(FFMContext), ffm_probe, ffm_read_header, diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index d3008bf010..4e2d0b95b6 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -253,7 +253,7 @@ static int ffm_write_trailer(AVFormatContext *s) AVOutputFormat ffm_muxer = { "ffm", - "ffm format", + NULL_IF_CONFIG_SMALL("ffm format"), "", "ffm", sizeof(FFMContext), diff --git a/libavformat/flic.c b/libavformat/flic.c index b422fb09ae..adfa637f44 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -194,7 +194,7 @@ static int flic_read_close(AVFormatContext *s) AVInputFormat flic_demuxer = { "flic", - "FLI/FLC/FLX animation format", + NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"), sizeof(FlicDemuxContext), flic_probe, flic_read_header, diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 05ea0be86d..ad14d3b3c9 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -419,7 +419,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat flv_demuxer = { "flv", - "flv format", + NULL_IF_CONFIG_SMALL("FLV format"), 0, flv_probe, flv_read_header, diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 40654bf507..29413567ce 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -374,7 +374,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) AVOutputFormat flv_muxer = { "flv", - "flv format", + NULL_IF_CONFIG_SMALL("FLV format"), "video/x-flv", "flv", sizeof(FLVContext), diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index 0b537158c4..beb1bde0c3 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -35,7 +35,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat framecrc_muxer = { "framecrc", - "framecrc testing format", + NULL_IF_CONFIG_SMALL("framecrc testing format"), NULL, "", 0, diff --git a/libavformat/gif.c b/libavformat/gif.c index dab39a2afb..0c6686fead 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -407,7 +407,7 @@ static int gif_write_trailer(AVFormatContext *s) AVOutputFormat gif_muxer = { "gif", - "GIF Animation", + NULL_IF_CONFIG_SMALL("GIF Animation"), "image/gif", "gif", sizeof(GIFContext), diff --git a/libavformat/gifdec.c b/libavformat/gifdec.c index 82a80c8dcf..d1e80aeb10 100644 --- a/libavformat/gifdec.c +++ b/libavformat/gifdec.c @@ -581,7 +581,7 @@ static int gif_read_close(AVFormatContext *s1) AVInputFormat gif_demuxer = { "gif", - "gif format", + NULL_IF_CONFIG_SMALL("GIF format"), sizeof(GifState), gif_video_probe, gif_read_header, diff --git a/libavformat/gxf.c b/libavformat/gxf.c index 5a0675fe2d..43193beb72 100644 --- a/libavformat/gxf.c +++ b/libavformat/gxf.c @@ -492,7 +492,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index, AVInputFormat gxf_demuxer = { "gxf", - "GXF format", + NULL_IF_CONFIG_SMALL("GXF format"), 0, gxf_probe, gxf_header, diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 588a223f00..20d09473fb 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -813,7 +813,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk AVOutputFormat gxf_muxer = { "gxf", - "GXF format", + NULL_IF_CONFIG_SMALL("GXF format"), NULL, "gxf", sizeof(GXFContext), diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 914a3532ac..3485e68ed6 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -288,7 +288,7 @@ static int idcin_read_close(AVFormatContext *s) AVInputFormat idcin_demuxer = { "idcin", - "Id CIN format", + NULL_IF_CONFIG_SMALL("Id CIN format"), sizeof(IdcinDemuxContext), idcin_probe, idcin_read_header, diff --git a/libavformat/idroq.c b/libavformat/idroq.c index 394697fcdc..482f7e3663 100644 --- a/libavformat/idroq.c +++ b/libavformat/idroq.c @@ -279,7 +279,7 @@ static int roq_read_close(AVFormatContext *s) AVInputFormat roq_demuxer = { "RoQ", - "Id RoQ format", + NULL_IF_CONFIG_SMALL("Id RoQ format"), sizeof(RoqDemuxContext), roq_probe, roq_read_header, diff --git a/libavformat/iff.c b/libavformat/iff.c index 39fc6d8efe..a996a7fbc2 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -192,7 +192,7 @@ static int iff_read_packet(AVFormatContext *s, AVInputFormat iff_demuxer = { "IFF", - "IFF format", + NULL_IF_CONFIG_SMALL("IFF format"), sizeof(IffDemuxContext), iff_probe, iff_read_header, diff --git a/libavformat/img2.c b/libavformat/img2.c index 1e7bcc6992..766d4a99a1 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -379,7 +379,7 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt) #ifdef CONFIG_IMAGE2_DEMUXER AVInputFormat image2_demuxer = { "image2", - "image2 sequence", + NULL_IF_CONFIG_SMALL("image2 sequence"), sizeof(VideoData), image_probe, img_read_header, @@ -393,7 +393,7 @@ AVInputFormat image2_demuxer = { #ifdef CONFIG_IMAGE2PIPE_DEMUXER AVInputFormat image2pipe_demuxer = { "image2pipe", - "piped image2 sequence", + NULL_IF_CONFIG_SMALL("piped image2 sequence"), sizeof(VideoData), NULL, /* no probe */ img_read_header, @@ -407,7 +407,7 @@ AVInputFormat image2pipe_demuxer = { #ifdef CONFIG_IMAGE2_MUXER AVOutputFormat image2_muxer = { "image2", - "image2 sequence", + NULL_IF_CONFIG_SMALL("image2 sequence"), "", "", sizeof(VideoData), @@ -422,7 +422,7 @@ AVOutputFormat image2_muxer = { #ifdef CONFIG_IMAGE2PIPE_MUXER AVOutputFormat image2pipe_muxer = { "image2pipe", - "piped image2 sequence", + NULL_IF_CONFIG_SMALL("piped image2 sequence"), "", "", sizeof(VideoData), diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 4f5068af4e..d00f788d9c 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -616,7 +616,7 @@ static int ipmovie_read_close(AVFormatContext *s) AVInputFormat ipmovie_demuxer = { "ipmovie", - "Interplay MVE format", + NULL_IF_CONFIG_SMALL("Interplay MVE format"), sizeof(IPMVEContext), ipmovie_probe, ipmovie_read_header, diff --git a/libavformat/libnut.c b/libavformat/libnut.c index f5423069f1..2cadaefcbd 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -299,7 +299,7 @@ static int nut_read_close(AVFormatContext *s) { AVInputFormat libnut_demuxer = { "libnut", - "nut format", + NULL_IF_CONFIG_SMALL("NUT format"), sizeof(NUTContext), nut_probe, nut_read_header, diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c index 6646a412bc..7f01124ad0 100644 --- a/libavformat/lmlm4.c +++ b/libavformat/lmlm4.c @@ -118,7 +118,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) { AVInputFormat lmlm4_demuxer = { "lmlm4", - "lmlm4 raw format", + NULL_IF_CONFIG_SMALL("lmlm4 raw format"), 0, lmlm4_probe, lmlm4_read_header, diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index f41a84a9d5..89ce071fdb 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3248,7 +3248,7 @@ matroska_read_close (AVFormatContext *s) AVInputFormat matroska_demuxer = { "matroska", - "Matroska file format", + NULL_IF_CONFIG_SMALL("Matroska file format"), sizeof(MatroskaDemuxContext), matroska_probe, matroska_read_header, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f799182c60..a13843777f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -819,7 +819,7 @@ static int mkv_write_trailer(AVFormatContext *s) AVOutputFormat matroska_muxer = { "matroska", - "Matroska File Format", + NULL_IF_CONFIG_SMALL("Matroska file format"), "video/x-matroska", "mkv", sizeof(MatroskaMuxContext), @@ -834,7 +834,7 @@ AVOutputFormat matroska_muxer = { AVOutputFormat matroska_audio_muxer = { "matroska", - "Matroska File Format", + NULL_IF_CONFIG_SMALL("Matroska file format"), "audio/x-matroska", "mka", sizeof(MatroskaMuxContext), diff --git a/libavformat/mm.c b/libavformat/mm.c index 4e6bac0271..bfb88d5644 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -201,7 +201,7 @@ static int mm_read_close(AVFormatContext *s) AVInputFormat mm_demuxer = { "mm", - "American Laser Games MM format", + NULL_IF_CONFIG_SMALL("American Laser Games MM format"), sizeof(MmDemuxContext), mm_probe, mm_read_header, diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 84c21a01d2..df9f299219 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -304,7 +304,7 @@ static int mmf_read_seek(AVFormatContext *s, #ifdef CONFIG_MMF_DEMUXER AVInputFormat mmf_demuxer = { "mmf", - "mmf format", + NULL_IF_CONFIG_SMALL("mmf format"), sizeof(MMFContext), mmf_probe, mmf_read_header, @@ -316,7 +316,7 @@ AVInputFormat mmf_demuxer = { #ifdef CONFIG_MMF_MUXER AVOutputFormat mmf_muxer = { "mmf", - "mmf format", + NULL_IF_CONFIG_SMALL("mmf format"), "application/vnd.smaf", "mmf", sizeof(MMFContext), diff --git a/libavformat/mov.c b/libavformat/mov.c index 86a3e0b767..76c25a3e4d 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1914,7 +1914,7 @@ static int mov_read_close(AVFormatContext *s) AVInputFormat mov_demuxer = { "mov,mp4,m4a,3gp,3g2,mj2", - "QuickTime/MPEG4/Motion JPEG 2000 format", + NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"), sizeof(MOVContext), mov_probe, mov_read_header, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e4f7066f12..937b907919 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1666,7 +1666,7 @@ static int mov_write_trailer(AVFormatContext *s) #ifdef CONFIG_MOV_MUXER AVOutputFormat mov_muxer = { "mov", - "mov format", + NULL_IF_CONFIG_SMALL("MOV format"), NULL, "mov", sizeof(MOVContext), @@ -1682,7 +1682,7 @@ AVOutputFormat mov_muxer = { #ifdef CONFIG_TGP_MUXER AVOutputFormat tgp_muxer = { "3gp", - "3gp format", + NULL_IF_CONFIG_SMALL("3GP format"), NULL, "3gp", sizeof(MOVContext), @@ -1698,7 +1698,7 @@ AVOutputFormat tgp_muxer = { #ifdef CONFIG_MP4_MUXER AVOutputFormat mp4_muxer = { "mp4", - "mp4 format", + NULL_IF_CONFIG_SMALL("MP4 format"), "application/mp4", "mp4,m4a", sizeof(MOVContext), @@ -1714,7 +1714,7 @@ AVOutputFormat mp4_muxer = { #ifdef CONFIG_PSP_MUXER AVOutputFormat psp_muxer = { "psp", - "psp mp4 format", + NULL_IF_CONFIG_SMALL("PSP MP4 format"), NULL, "mp4,psp", sizeof(MOVContext), @@ -1730,7 +1730,7 @@ AVOutputFormat psp_muxer = { #ifdef CONFIG_TG2_MUXER AVOutputFormat tg2_muxer = { "3g2", - "3gp2 format", + NULL_IF_CONFIG_SMALL("3GP2 format"), NULL, "3g2", sizeof(MOVContext), @@ -1746,7 +1746,7 @@ AVOutputFormat tg2_muxer = { #ifdef CONFIG_IPOD_MUXER AVOutputFormat ipod_muxer = { "ipod", - "iPod H.264 mp4 format", + NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"), "application/mp4", NULL, sizeof(MOVContext), diff --git a/libavformat/mp3.c b/libavformat/mp3.c index 459bf23ea2..5a75a95fbe 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -646,7 +646,7 @@ static int mp3_write_trailer(struct AVFormatContext *s) #ifdef CONFIG_MP3_DEMUXER AVInputFormat mp3_demuxer = { "mp3", - "MPEG audio", + NULL_IF_CONFIG_SMALL("MPEG audio"), 0, mp3_read_probe, mp3_read_header, @@ -659,7 +659,7 @@ AVInputFormat mp3_demuxer = { #ifdef CONFIG_MP2_MUXER AVOutputFormat mp2_muxer = { "mp2", - "MPEG audio layer 2", + NULL_IF_CONFIG_SMALL("MPEG audio layer 2"), "audio/x-mpeg", #ifdef CONFIG_LIBMP3LAME "mp2,m2a", @@ -677,7 +677,7 @@ AVOutputFormat mp2_muxer = { #ifdef CONFIG_MP3_MUXER AVOutputFormat mp3_muxer = { "mp3", - "MPEG audio layer 3", + NULL_IF_CONFIG_SMALL("MPEG audio layer 3"), "audio/x-mpeg", "mp3", 0, diff --git a/libavformat/mpc.c b/libavformat/mpc.c index 24ff7aad40..7ed574d866 100644 --- a/libavformat/mpc.c +++ b/libavformat/mpc.c @@ -219,7 +219,7 @@ static int mpc_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp AVInputFormat mpc_demuxer = { "mpc", - "musepack", + NULL_IF_CONFIG_SMALL("Musepack"), sizeof(MPCContext), mpc_probe, mpc_read_header, diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index f6cc098954..6ede777b5f 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -235,7 +235,7 @@ static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestam AVInputFormat mpc8_demuxer = { "mpc8", - "musepack8", + NULL_IF_CONFIG_SMALL("Musepack SV8"), sizeof(MPCContext), mpc8_probe, mpc8_read_header, diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index ce58e10465..6e63c4342e 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -583,7 +583,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, AVInputFormat mpegps_demuxer = { "mpeg", - "MPEG PS format", + NULL_IF_CONFIG_SMALL("MPEG-PS format"), sizeof(MpegDemuxContext), mpegps_probe, mpegps_read_header, diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 09561a9ce8..1606edcc19 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1221,7 +1221,7 @@ static int mpeg_mux_end(AVFormatContext *ctx) #ifdef CONFIG_MPEG1SYSTEM_MUXER AVOutputFormat mpeg1system_muxer = { "mpeg", - "MPEG1 System format", + NULL_IF_CONFIG_SMALL("MPEG-1 System format"), "video/mpeg", "mpg,mpeg", sizeof(MpegMuxContext), @@ -1235,7 +1235,7 @@ AVOutputFormat mpeg1system_muxer = { #ifdef CONFIG_MPEG1VCD_MUXER AVOutputFormat mpeg1vcd_muxer = { "vcd", - "MPEG1 System format (VCD)", + NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"), "video/mpeg", NULL, sizeof(MpegMuxContext), @@ -1249,7 +1249,7 @@ AVOutputFormat mpeg1vcd_muxer = { #ifdef CONFIG_MPEG2VOB_MUXER AVOutputFormat mpeg2vob_muxer = { "vob", - "MPEG2 PS format (VOB)", + NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"), "video/mpeg", "vob", sizeof(MpegMuxContext), @@ -1265,7 +1265,7 @@ AVOutputFormat mpeg2vob_muxer = { #ifdef CONFIG_MPEG2SVCD_MUXER AVOutputFormat mpeg2svcd_muxer = { "svcd", - "MPEG2 PS format (VOB)", + NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"), "video/mpeg", "vob", sizeof(MpegMuxContext), @@ -1281,7 +1281,7 @@ AVOutputFormat mpeg2svcd_muxer = { #ifdef CONFIG_MPEG2DVD_MUXER AVOutputFormat mpeg2dvd_muxer = { "dvd", - "MPEG2 PS format (DVD VOB)", + NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"), "video/mpeg", "dvd", sizeof(MpegMuxContext), diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index e5ae4d6441..da75ff1625 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1499,7 +1499,7 @@ void mpegts_parse_close(MpegTSContext *ts) AVInputFormat mpegts_demuxer = { "mpegts", - "MPEG2 transport stream format", + NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"), sizeof(MpegTSContext), mpegts_probe, mpegts_read_header, @@ -1512,7 +1512,7 @@ AVInputFormat mpegts_demuxer = { AVInputFormat mpegtsraw_demuxer = { "mpegtsraw", - "MPEG2 raw transport stream format", + NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"), sizeof(MpegTSContext), NULL, mpegts_read_header, diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 188830116b..4a70a15f74 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -684,7 +684,7 @@ static int mpegts_write_end(AVFormatContext *s) AVOutputFormat mpegts_muxer = { "mpegts", - "MPEG2 transport stream format", + NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"), "video/x-mpegts", "ts,m2t", sizeof(MpegTSWrite), diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index 2e745721bf..ecaad55ea7 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -55,7 +55,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s) AVOutputFormat mpjpeg_muxer = { "mpjpeg", - "Mime multipart JPEG format", + NULL_IF_CONFIG_SMALL("Mime multipart JPEG format"), "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG, "mjpg", 0, diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c index df79c0187d..34ab9d94bb 100644 --- a/libavformat/msnwc_tcp.c +++ b/libavformat/msnwc_tcp.c @@ -132,7 +132,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt) AVInputFormat msnwc_tcp_demuxer = { "msnwctcp", - "MSN TCP Webcam stream", + NULL_IF_CONFIG_SMALL("MSN TCP Webcam stream"), 0, msnwc_tcp_probe, msnwc_tcp_read_header, diff --git a/libavformat/mtv.c b/libavformat/mtv.c index d8fa198edf..557846f6eb 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -176,7 +176,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat mtv_demuxer = { "MTV", - "MTV format", + NULL_IF_CONFIG_SMALL("MTV format"), sizeof(MTVDemuxContext), mtv_probe, mtv_read_header, diff --git a/libavformat/mxf.c b/libavformat/mxf.c index df3a890305..e2f4997fad 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -1061,7 +1061,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti AVInputFormat mxf_demuxer = { "mxf", - "MXF format", + NULL_IF_CONFIG_SMALL("MXF format"), sizeof(MXFContext), mxf_probe, mxf_read_header, diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 5e77654587..f4514cc333 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -751,7 +751,7 @@ static int nsv_probe(AVProbeData *p) AVInputFormat nsv_demuxer = { "nsv", - "NullSoft Video format", + NULL_IF_CONFIG_SMALL("NullSoft Video format"), sizeof(NSVContext), nsv_probe, nsv_read_header, diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index fd7c893490..5dac94c4b9 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -908,7 +908,7 @@ static int nut_read_close(AVFormatContext *s) #ifdef CONFIG_NUT_DEMUXER AVInputFormat nut_demuxer = { "nut", - "nut format", + NULL_IF_CONFIG_SMALL("NUT format"), sizeof(NUTContext), nut_probe, nut_read_header, diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 58debcb25e..78e678f0fa 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -802,7 +802,7 @@ static int write_trailer(AVFormatContext *s){ AVOutputFormat nut_muxer = { "nut", - "nut format", + NULL_IF_CONFIG_SMALL("NUT format"), "video/x-nut", "nut", sizeof(NUTContext), diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 88765af9f5..74393afaa7 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -242,7 +242,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { AVInputFormat nuv_demuxer = { "nuv", - "NuppelVideo format", + NULL_IF_CONFIG_SMALL("NuppelVideo format"), sizeof(NUVContext), nuv_probe, nuv_header, diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 96d16a8737..7eb9847265 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -584,7 +584,7 @@ static int ogg_probe(AVProbeData *p) AVInputFormat ogg_demuxer = { "ogg", - "Ogg", + NULL_IF_CONFIG_SMALL("Ogg"), sizeof (ogg_t), ogg_probe, ogg_read_header, diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index fe05fba919..717448851b 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -279,7 +279,7 @@ static int ogg_write_trailer(AVFormatContext *s) AVOutputFormat ogg_muxer = { "ogg", - "Ogg format", + NULL_IF_CONFIG_SMALL("Ogg"), "application/ogg", "ogg", 0, diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 2ba805f84f..df9f1c0427 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -351,7 +351,7 @@ static int str_read_close(AVFormatContext *s) AVInputFormat str_demuxer = { "psxstr", - "Sony Playstation STR format", + NULL_IF_CONFIG_SMALL("Sony Playstation STR format"), sizeof(StrDemuxContext), str_probe, str_read_header, diff --git a/libavformat/pva.c b/libavformat/pva.c index 03b92bf3d6..32827d43e8 100644 --- a/libavformat/pva.c +++ b/libavformat/pva.c @@ -202,7 +202,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index, AVInputFormat pva_demuxer = { "pva", - "pva file and stream format", + NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"), sizeof(PVAContext), pva_probe, pva_read_header, diff --git a/libavformat/raw.c b/libavformat/raw.c index db427c0299..5217209bd1 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -431,7 +431,7 @@ static int flac_probe(AVProbeData *p) AVInputFormat shorten_demuxer = { "shn", - "raw shorten", + NULL_IF_CONFIG_SMALL("raw Shorten"), 0, NULL, audio_read_header, @@ -444,7 +444,7 @@ AVInputFormat shorten_demuxer = { AVInputFormat mlp_demuxer = { "mlp", - "raw mlp", + NULL_IF_CONFIG_SMALL("raw MLP"), 0, NULL, audio_read_header, @@ -457,7 +457,7 @@ AVInputFormat mlp_demuxer = { AVInputFormat flac_demuxer = { "flac", - "raw flac", + NULL_IF_CONFIG_SMALL("raw FLAC"), 0, flac_probe, audio_read_header, @@ -471,7 +471,7 @@ AVInputFormat flac_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat flac_muxer = { "flac", - "raw flac", + NULL_IF_CONFIG_SMALL("raw FLAC"), "audio/x-flac", "flac", 0, @@ -486,7 +486,7 @@ AVOutputFormat flac_muxer = { #ifdef CONFIG_AC3_DEMUXER AVInputFormat ac3_demuxer = { "ac3", - "raw ac3", + NULL_IF_CONFIG_SMALL("raw AC-3"), 0, ac3_probe, audio_read_header, @@ -501,7 +501,7 @@ AVInputFormat ac3_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat ac3_muxer = { "ac3", - "raw ac3", + NULL_IF_CONFIG_SMALL("raw AC-3"), "audio/x-ac3", "ac3", 0, @@ -514,7 +514,7 @@ AVOutputFormat ac3_muxer = { AVOutputFormat dts_muxer = { "dts", - "raw dts", + NULL_IF_CONFIG_SMALL("raw DTS"), "audio/x-dca", "dts", 0, @@ -529,7 +529,7 @@ AVOutputFormat dts_muxer = { AVInputFormat dirac_demuxer = { "dirac", - "raw dirac", + NULL_IF_CONFIG_SMALL("raw Dirac"), 0, dirac_probe, video_read_header, @@ -542,7 +542,7 @@ AVInputFormat dirac_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat dirac_muxer = { "dirac", - "raw dirac", + NULL_IF_CONFIG_SMALL("raw Dirac"), NULL, "drc", 0, @@ -556,7 +556,7 @@ AVOutputFormat dirac_muxer = { AVInputFormat dts_demuxer = { "dts", - "raw dts", + NULL_IF_CONFIG_SMALL("raw DTS"), 0, dts_probe, audio_read_header, @@ -569,7 +569,7 @@ AVInputFormat dts_demuxer = { AVInputFormat aac_demuxer = { "aac", - "ADTS AAC", + NULL_IF_CONFIG_SMALL("ADTS AAC"), 0, NULL, audio_read_header, @@ -582,7 +582,7 @@ AVInputFormat aac_demuxer = { AVInputFormat gsm_demuxer = { "gsm", - "GSM", + NULL_IF_CONFIG_SMALL("GSM"), 0, NULL, audio_read_header, @@ -597,7 +597,7 @@ AVInputFormat gsm_demuxer = { AVOutputFormat roq_muxer = { "RoQ", - "Id RoQ format", + NULL_IF_CONFIG_SMALL("Id RoQ format"), NULL, "roq", 0, @@ -610,7 +610,7 @@ AVOutputFormat roq_muxer = AVInputFormat h261_demuxer = { "h261", - "raw h261", + NULL_IF_CONFIG_SMALL("raw H.261"), 0, h261_probe, video_read_header, @@ -624,7 +624,7 @@ AVInputFormat h261_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat h261_muxer = { "h261", - "raw h261", + NULL_IF_CONFIG_SMALL("raw H.261"), "video/x-h261", "h261", 0, @@ -638,7 +638,7 @@ AVOutputFormat h261_muxer = { AVInputFormat h263_demuxer = { "h263", - "raw h263", + NULL_IF_CONFIG_SMALL("raw H.263"), 0, h263_probe, video_read_header, @@ -652,7 +652,7 @@ AVInputFormat h263_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat h263_muxer = { "h263", - "raw h263", + NULL_IF_CONFIG_SMALL("raw H.263"), "video/x-h263", "h263", 0, @@ -666,7 +666,7 @@ AVOutputFormat h263_muxer = { AVInputFormat m4v_demuxer = { "m4v", - "raw MPEG4 video format", + NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), 0, mpeg4video_probe, /** probing for mpeg4 data */ video_read_header, @@ -680,7 +680,7 @@ AVInputFormat m4v_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat m4v_muxer = { "m4v", - "raw MPEG4 video format", + NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), NULL, "m4v", 0, @@ -694,7 +694,7 @@ AVOutputFormat m4v_muxer = { AVInputFormat h264_demuxer = { "h264", - "raw H264 video format", + NULL_IF_CONFIG_SMALL("raw H.264 video format"), 0, NULL /*mpegvideo_probe*/, video_read_header, @@ -708,7 +708,7 @@ AVInputFormat h264_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat h264_muxer = { "h264", - "raw H264 video format", + NULL_IF_CONFIG_SMALL("raw H.264 video format"), NULL, "h264", 0, @@ -722,7 +722,7 @@ AVOutputFormat h264_muxer = { AVInputFormat mpegvideo_demuxer = { "mpegvideo", - "MPEG video", + NULL_IF_CONFIG_SMALL("MPEG video"), 0, mpegvideo_probe, video_read_header, @@ -735,7 +735,7 @@ AVInputFormat mpegvideo_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat mpeg1video_muxer = { "mpeg1video", - "MPEG video", + NULL_IF_CONFIG_SMALL("MPEG video"), "video/x-mpeg", "mpg,mpeg,m1v", 0, @@ -750,7 +750,7 @@ AVOutputFormat mpeg1video_muxer = { #ifdef CONFIG_MUXERS AVOutputFormat mpeg2video_muxer = { "mpeg2video", - "MPEG2 video", + NULL_IF_CONFIG_SMALL("MPEG-2 video"), NULL, "m2v", 0, @@ -764,7 +764,7 @@ AVOutputFormat mpeg2video_muxer = { AVInputFormat mjpeg_demuxer = { "mjpeg", - "MJPEG video", + NULL_IF_CONFIG_SMALL("MJPEG video"), 0, NULL, video_read_header, @@ -777,7 +777,7 @@ AVInputFormat mjpeg_demuxer = { AVInputFormat ingenient_demuxer = { "ingenient", - "Ingenient MJPEG", + NULL_IF_CONFIG_SMALL("Ingenient MJPEG"), 0, NULL, video_read_header, @@ -791,7 +791,7 @@ AVInputFormat ingenient_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat mjpeg_muxer = { "mjpeg", - "MJPEG video", + NULL_IF_CONFIG_SMALL("MJPEG video"), "video/x-mjpeg", "mjpg,mjpeg", 0, @@ -805,7 +805,7 @@ AVOutputFormat mjpeg_muxer = { AVInputFormat vc1_demuxer = { "vc1", - "raw vc1", + NULL_IF_CONFIG_SMALL("raw VC-1"), 0, NULL /* vc1_probe */, video_read_header, @@ -820,7 +820,7 @@ AVInputFormat vc1_demuxer = { #define PCMINPUTDEF(name, long_name, ext, codec) \ AVInputFormat pcm_ ## name ## _demuxer = {\ #name,\ - long_name,\ + NULL_IF_CONFIG_SMALL(long_name),\ 0,\ NULL,\ raw_read_header,\ @@ -835,7 +835,7 @@ AVInputFormat pcm_ ## name ## _demuxer = {\ #define PCMOUTPUTDEF(name, long_name, ext, codec) \ AVOutputFormat pcm_ ## name ## _muxer = {\ #name,\ - long_name,\ + NULL_IF_CONFIG_SMALL(long_name),\ NULL,\ ext,\ 0,\ @@ -920,7 +920,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat rawvideo_demuxer = { "rawvideo", - "raw video format", + NULL_IF_CONFIG_SMALL("raw video format"), 0, NULL, raw_read_header, @@ -934,7 +934,7 @@ AVInputFormat rawvideo_demuxer = { #ifdef CONFIG_MUXERS AVOutputFormat rawvideo_muxer = { "rawvideo", - "raw video format", + NULL_IF_CONFIG_SMALL("raw video format"), NULL, "yuv,rgb", 0, @@ -954,7 +954,7 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat null_muxer = { "null", - "null video format", + NULL_IF_CONFIG_SMALL("null video format"), NULL, NULL, 0, diff --git a/libavformat/rl2.c b/libavformat/rl2.c index ca81ff8e34..407867fb5b 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -288,7 +288,7 @@ static int rl2_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp AVInputFormat rl2_demuxer = { "rl2", - "rl2 format", + NULL_IF_CONFIG_SMALL("rl2 format"), sizeof(Rl2DemuxContext), rl2_probe, rl2_read_header, diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index a2aa9c8cd1..128e3a2a9b 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -793,7 +793,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index, AVInputFormat rm_demuxer = { "rm", - "rm format", + NULL_IF_CONFIG_SMALL("RM format"), sizeof(RMContext), rm_probe, rm_read_header, diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 881c347c22..03f629e7be 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -432,7 +432,7 @@ static int rm_write_trailer(AVFormatContext *s) AVOutputFormat rm_muxer = { "rm", - "rm format", + NULL_IF_CONFIG_SMALL("RM format"), "application/vnd.rn-realmedia", "rm,ra", sizeof(RMContext), diff --git a/libavformat/rpl.c b/libavformat/rpl.c index fa284c14e9..7340e18e63 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -348,7 +348,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat rpl_demuxer = { "rpl", - "RPL/ARMovie format", + NULL_IF_CONFIG_SMALL("RPL/ARMovie format"), sizeof(RPLContext), rpl_probe, rpl_read_header, diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index c6cd3cc350..c1e8e16f07 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -356,7 +356,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) AVOutputFormat rtp_muxer = { "rtp", - "RTP output format", + NULL_IF_CONFIG_SMALL("RTP output format"), NULL, NULL, sizeof(RTPDemuxContext), diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 8819d02b25..b0f63967ac 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1354,7 +1354,7 @@ static int rtsp_read_close(AVFormatContext *s) #ifdef CONFIG_RTSP_DEMUXER AVInputFormat rtsp_demuxer = { "rtsp", - "RTSP input format", + NULL_IF_CONFIG_SMALL("RTSP input format"), sizeof(RTSPState), rtsp_probe, rtsp_read_header, @@ -1462,7 +1462,7 @@ static int sdp_read_close(AVFormatContext *s) #ifdef CONFIG_SDP_DEMUXER AVInputFormat sdp_demuxer = { "sdp", - "SDP", + NULL_IF_CONFIG_SMALL("SDP"), sizeof(RTSPState), sdp_probe, sdp_read_header, @@ -1529,7 +1529,7 @@ static int redir_read_header(AVFormatContext *s, AVFormatParameters *ap) AVInputFormat redir_demuxer = { "redir", - "Redirector format", + NULL_IF_CONFIG_SMALL("Redirector format"), 0, redir_probe, redir_read_header, diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 5b149a7ca5..4c6d138d6b 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -283,7 +283,7 @@ static int film_read_close(AVFormatContext *s) AVInputFormat segafilm_demuxer = { "film_cpk", - "Sega FILM/CPK format", + NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"), sizeof(FilmDemuxContext), film_probe, film_read_header, diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index fc757906c4..7b0e700718 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -291,7 +291,7 @@ static int vmd_read_close(AVFormatContext *s) AVInputFormat vmd_demuxer = { "vmd", - "Sierra VMD format", + NULL_IF_CONFIG_SMALL("Sierra VMD format"), sizeof(VmdDemuxContext), vmd_probe, vmd_read_header, diff --git a/libavformat/siff.c b/libavformat/siff.c index c8f892b8d5..30bd307c97 100644 --- a/libavformat/siff.c +++ b/libavformat/siff.c @@ -227,7 +227,7 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat siff_demuxer = { "siff", - "Beam Software SIFF", + NULL_IF_CONFIG_SMALL("Beam Software SIFF"), sizeof(SIFFContext), siff_probe, siff_read_header, diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 460ed0c93b..8d0b7428ba 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -336,7 +336,7 @@ static int smacker_read_close(AVFormatContext *s) AVInputFormat smacker_demuxer = { "smk", - "Smacker Video", + NULL_IF_CONFIG_SMALL("Smacker video"), sizeof(SmackerContext), smacker_probe, smacker_read_header, diff --git a/libavformat/sol.c b/libavformat/sol.c index f2eedc7fe7..71b4fbe49b 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -147,7 +147,7 @@ static int sol_read_close(AVFormatContext *s) AVInputFormat sol_demuxer = { "sol", - "Sierra SOL Format", + NULL_IF_CONFIG_SMALL("Sierra SOL format"), 0, sol_probe, sol_read_header, diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index e0da824f38..d899b2d822 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -185,7 +185,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat swf_demuxer = { "swf", - "Flash format", + NULL_IF_CONFIG_SMALL("Flash format"), sizeof(SWFContext), swf_probe, swf_read_header, diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index dcba793839..193663f61e 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -503,7 +503,7 @@ static int swf_write_trailer(AVFormatContext *s) #ifdef CONFIG_SWF_MUXER AVOutputFormat swf_muxer = { "swf", - "Flash format", + NULL_IF_CONFIG_SMALL("Flash format"), "application/x-shockwave-flash", "swf", sizeof(SWFContext), @@ -517,7 +517,7 @@ AVOutputFormat swf_muxer = { #ifdef CONFIG_AVM2_MUXER AVOutputFormat avm2_muxer = { "avm2", - "Flash 9 (AVM2) format", + NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"), "application/x-shockwave-flash", NULL, sizeof(SWFContext), diff --git a/libavformat/thp.c b/libavformat/thp.c index a0747ecad8..434bc297a4 100644 --- a/libavformat/thp.c +++ b/libavformat/thp.c @@ -189,7 +189,7 @@ static int thp_read_packet(AVFormatContext *s, AVInputFormat thp_demuxer = { "thp", - "THP", + NULL_IF_CONFIG_SMALL("THP"), sizeof(ThpDemuxContext), thp_probe, thp_read_header, diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c index 88a65fa50c..f9c9be1796 100644 --- a/libavformat/tiertexseq.c +++ b/libavformat/tiertexseq.c @@ -304,7 +304,7 @@ static int seq_read_close(AVFormatContext *s) AVInputFormat tiertexseq_demuxer = { "tiertexseq", - "Tiertex Limited SEQ format", + NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"), sizeof(SeqDemuxContext), seq_probe, seq_read_header, diff --git a/libavformat/tta.c b/libavformat/tta.c index bfdc39b1a6..9a30e1fc87 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -139,7 +139,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp AVInputFormat tta_demuxer = { "tta", - "true-audio", + NULL_IF_CONFIG_SMALL("True Audio"), sizeof(TTAContext), tta_probe, tta_read_header, diff --git a/libavformat/txd.c b/libavformat/txd.c index 8092a41a48..e8e263c6fd 100644 --- a/libavformat/txd.c +++ b/libavformat/txd.c @@ -94,7 +94,7 @@ static int txd_read_close(AVFormatContext *s) { AVInputFormat txd_demuxer = { "txd", - "txd format", + NULL_IF_CONFIG_SMALL("txd format"), 0, txd_probe, txd_read_header, diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index 531fd8515b..7601ea9078 100644 --- a/libavformat/vc1test.c +++ b/libavformat/vc1test.c @@ -103,7 +103,7 @@ static int vc1t_read_packet(AVFormatContext *s, AVInputFormat vc1t_demuxer = { "vc1test", - "VC1 test bitstream format", + NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"), 0, vc1t_probe, vc1t_read_header, diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index 7c50fa588c..06ef0c37bf 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -136,7 +136,7 @@ static int voc_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat voc_demuxer = { "voc", - "Creative Voice File format", + NULL_IF_CONFIG_SMALL("Creative Voice file format"), sizeof(voc_dec_context_t), voc_probe, voc_read_header, diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index d967fae095..a96dfc7616 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -90,7 +90,7 @@ static int voc_write_trailer(AVFormatContext *s) AVOutputFormat voc_muxer = { "voc", - "Creative Voice File format", + NULL_IF_CONFIG_SMALL("Creative Voice file format"), "audio/x-voc", "voc", sizeof(voc_enc_context_t), diff --git a/libavformat/wav.c b/libavformat/wav.c index ffcc4ac6e5..44c245d13b 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -262,7 +262,7 @@ static int wav_read_seek(AVFormatContext *s, #ifdef CONFIG_WAV_DEMUXER AVInputFormat wav_demuxer = { "wav", - "wav format", + NULL_IF_CONFIG_SMALL("WAV format"), sizeof(WAVContext), wav_probe, wav_read_header, @@ -276,7 +276,7 @@ AVInputFormat wav_demuxer = { #ifdef CONFIG_WAV_MUXER AVOutputFormat wav_muxer = { "wav", - "wav format", + NULL_IF_CONFIG_SMALL("WAV format"), "audio/x-wav", "wav", sizeof(WAVContext), diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index 922ec58963..bb9a6e275d 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -385,7 +385,7 @@ static int wc3_read_close(AVFormatContext *s) AVInputFormat wc3_demuxer = { "wc3movie", - "Wing Commander III movie format", + NULL_IF_CONFIG_SMALL("Wing Commander III movie format"), sizeof(Wc3DemuxContext), wc3_probe, wc3_read_header, diff --git a/libavformat/westwood.c b/libavformat/westwood.c index 5b06acbeb8..f6ff7ec8d0 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -388,7 +388,7 @@ static int wsvqa_read_close(AVFormatContext *s) #ifdef CONFIG_WSAUD_DEMUXER AVInputFormat wsaud_demuxer = { "wsaud", - "Westwood Studios audio format", + NULL_IF_CONFIG_SMALL("Westwood Studios audio format"), sizeof(WsAudDemuxContext), wsaud_probe, wsaud_read_header, @@ -399,7 +399,7 @@ AVInputFormat wsaud_demuxer = { #ifdef CONFIG_WSVQA_DEMUXER AVInputFormat wsvqa_demuxer = { "wsvqa", - "Westwood Studios VQA format", + NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"), sizeof(WsVqaDemuxContext), wsvqa_probe, wsvqa_read_header, diff --git a/libavformat/wv.c b/libavformat/wv.c index 3b6fcae09c..953955412d 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -226,7 +226,7 @@ static int wv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, AVInputFormat wv_demuxer = { "wv", - "WavPack", + NULL_IF_CONFIG_SMALL("WavPack"), sizeof(WVContext), wv_probe, wv_read_header, diff --git a/libavformat/xa.c b/libavformat/xa.c index 88f731a3da..c79df78a48 100644 --- a/libavformat/xa.c +++ b/libavformat/xa.c @@ -108,7 +108,7 @@ static int xa_read_packet(AVFormatContext *s, AVInputFormat xa_demuxer = { "xa", - "Maxis XA File Format", + NULL_IF_CONFIG_SMALL("Maxis XA File Format"), sizeof(MaxisXADemuxContext), xa_probe, xa_read_header, diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 3ba582e55e..5163417e5d 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -169,7 +169,7 @@ static int yuv4_write_header(AVFormatContext *s) #ifdef CONFIG_YUV4MPEGPIPE_MUXER AVOutputFormat yuv4mpegpipe_muxer = { "yuv4mpegpipe", - "YUV4MPEG pipe format", + NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), "", "y4m", sizeof(int), @@ -390,7 +390,7 @@ static int yuv4_probe(AVProbeData *pd) #ifdef CONFIG_YUV4MPEGPIPE_DEMUXER AVInputFormat yuv4mpegpipe_demuxer = { "yuv4mpegpipe", - "YUV4MPEG pipe format", + NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), sizeof(struct frame_attributes), yuv4_probe, yuv4_read_header, |