diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-07-24 23:51:41 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-07-30 13:59:06 +0200 |
| commit | 6774247a9d7d15033c2b80118c03cb0cb10027df (patch) | |
| tree | 94f4245e9c6d000e929d28dfecca9a26ecb04e6f | |
| parent | 8e5d71d1109bb509ae75d04682f326fe740a413f (diff) | |
| download | ffmpeg-6774247a9d7d15033c2b80118c03cb0cb10027df.tar.gz | |
avformat: Drop pointless "format" from container long names
86 files changed, 135 insertions, 135 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index fa6a26bcc2..135721fd25 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -349,7 +349,7 @@ static int fourxm_read_close(AVFormatContext *s) AVInputFormat ff_fourxm_demuxer = { .name = "4xm", - .long_name = NULL_IF_CONFIG_SMALL("4X Technologies format"), + .long_name = NULL_IF_CONFIG_SMALL("4X Technologies"), .priv_data_size = sizeof(FourxmDemuxContext), .read_probe = fourxm_probe, .read_header = fourxm_read_header, diff --git a/libavformat/amr.c b/libavformat/amr.c index f20bc0aa69..0812e0f40c 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -156,7 +156,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) #if CONFIG_AMR_DEMUXER AVInputFormat ff_amr_demuxer = { .name = "amr", - .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"), + .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"), .read_probe = amr_probe, .read_header = amr_read_header, .read_packet = amr_read_packet, @@ -167,7 +167,7 @@ AVInputFormat ff_amr_demuxer = { #if CONFIG_AMR_MUXER AVOutputFormat ff_amr_muxer = { .name = "amr", - .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR file format"), + .long_name = NULL_IF_CONFIG_SMALL("3GPP AMR"), .mime_type = "audio/amr", .extensions = "amr", .audio_codec = CODEC_ID_AMR_NB, diff --git a/libavformat/apc.c b/libavformat/apc.c index 30ddae3665..f6a3395cf4 100644 --- a/libavformat/apc.c +++ b/libavformat/apc.c @@ -82,7 +82,7 @@ static int apc_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_apc_demuxer = { .name = "apc", - .long_name = NULL_IF_CONFIG_SMALL("CRYO APC format"), + .long_name = NULL_IF_CONFIG_SMALL("CRYO APC"), .read_probe = apc_probe, .read_header = apc_read_header, .read_packet = apc_read_packet, diff --git a/libavformat/assdec.c b/libavformat/assdec.c index bb1f525616..bb85f29304 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -205,7 +205,7 @@ static int read_seek2(AVFormatContext *s, int stream_index, AVInputFormat ff_ass_demuxer = { .name = "ass", - .long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"), + .long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"), .priv_data_size = sizeof(ASSContext), .read_probe = probe, .read_header = read_header, diff --git a/libavformat/assenc.c b/libavformat/assenc.c index c53af16bbd..b3f422d8b9 100644 --- a/libavformat/assenc.c +++ b/libavformat/assenc.c @@ -79,7 +79,7 @@ static int write_trailer(AVFormatContext *s) AVOutputFormat ff_ass_muxer = { .name = "ass", - .long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"), + .long_name = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"), .mime_type = "text/x-ssa", .extensions = "ass,ssa", .priv_data_size = sizeof(ASSContext), diff --git a/libavformat/avs.c b/libavformat/avs.c index a03f7e336a..64c2289439 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -223,7 +223,7 @@ static int avs_read_close(AVFormatContext * s) AVInputFormat ff_avs_demuxer = { .name = "avs", - .long_name = NULL_IF_CONFIG_SMALL("AVS format"), + .long_name = NULL_IF_CONFIG_SMALL("AVS"), .priv_data_size = sizeof(AvsFormat), .read_probe = avs_probe, .read_header = avs_read_header, diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 3e6ec5fa6d..5acc3fc4b7 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -283,7 +283,7 @@ static int vid_read_close(AVFormatContext *s) AVInputFormat ff_bethsoftvid_demuxer = { .name = "bethsoftvid", - .long_name = NULL_IF_CONFIG_SMALL("Bethesda Softworks VID format"), + .long_name = NULL_IF_CONFIG_SMALL("Bethesda Softworks VID"), .priv_data_size = sizeof(BVID_DemuxContext), .read_probe = vid_probe, .read_header = vid_read_header, diff --git a/libavformat/cdg.c b/libavformat/cdg.c index bbc3b4025c..3b7b739c6c 100644 --- a/libavformat/cdg.c +++ b/libavformat/cdg.c @@ -65,7 +65,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_cdg_demuxer = { .name = "cdg", - .long_name = NULL_IF_CONFIG_SMALL("CD Graphics Format"), + .long_name = NULL_IF_CONFIG_SMALL("CD Graphics"), .read_header = read_header, .read_packet = read_packet, .extensions = "cdg", diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c index ed795e4cc5..809507fc05 100644 --- a/libavformat/cdxl.c +++ b/libavformat/cdxl.c @@ -171,7 +171,7 @@ static const AVClass cdxl_demuxer_class = { AVInputFormat ff_cdxl_demuxer = { .name = "cdxl", - .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video format"), + .long_name = NULL_IF_CONFIG_SMALL("Commodore CDXL video"), .priv_data_size = sizeof(CDXLDemuxContext), .read_header = cdxl_read_header, .read_packet = cdxl_read_packet, diff --git a/libavformat/crcenc.c b/libavformat/crcenc.c index c67fd09960..8c0c91d5a4 100644 --- a/libavformat/crcenc.c +++ b/libavformat/crcenc.c @@ -56,7 +56,7 @@ static int crc_write_trailer(struct AVFormatContext *s) AVOutputFormat ff_crc_muxer = { .name = "crc", - .long_name = NULL_IF_CONFIG_SMALL("CRC testing format"), + .long_name = NULL_IF_CONFIG_SMALL("CRC testing"), .extensions = "", .priv_data_size = sizeof(CRCState), .audio_codec = CODEC_ID_PCM_S16LE, diff --git a/libavformat/daud.c b/libavformat/daud.c index ef02b1a60a..1fd5c7ae80 100644 --- a/libavformat/daud.c +++ b/libavformat/daud.c @@ -72,7 +72,7 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt) #if CONFIG_DAUD_DEMUXER AVInputFormat ff_daud_demuxer = { .name = "daud", - .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"), + .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio"), .read_header = daud_header, .read_packet = daud_packet, .extensions = "302", @@ -82,7 +82,7 @@ AVInputFormat ff_daud_demuxer = { #if CONFIG_DAUD_MUXER AVOutputFormat ff_daud_muxer = { .name = "daud", - .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"), + .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio"), .extensions = "302", .audio_codec = CODEC_ID_PCM_S24DAUD, .video_codec = CODEC_ID_NONE, diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index f8ba68d962..24c58fcf04 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -219,7 +219,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_dsicin_demuxer = { .name = "dsicin", - .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN format"), + .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN"), .priv_data_size = sizeof(CinDemuxContext), .read_probe = cin_probe, .read_header = cin_read_header, diff --git a/libavformat/dv.c b/libavformat/dv.c index e02fb53f98..c71863a332 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -536,7 +536,7 @@ static int dv_probe(AVProbeData *p) #if CONFIG_DV_DEMUXER AVInputFormat ff_dv_demuxer = { .name = "dv", - .long_name = NULL_IF_CONFIG_SMALL("DV video format"), + .long_name = NULL_IF_CONFIG_SMALL("DV video"), .priv_data_size = sizeof(RawDVContext), .read_probe = dv_probe, .read_header = dv_read_header, diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 51eb16e27b..fdb259c3f1 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -405,7 +405,7 @@ static int dv_write_trailer(struct AVFormatContext *s) AVOutputFormat ff_dv_muxer = { .name = "dv", - .long_name = NULL_IF_CONFIG_SMALL("DV video format"), + .long_name = NULL_IF_CONFIG_SMALL("DV video"), .extensions = "dv", .priv_data_size = sizeof(DVMuxContext), .audio_codec = CODEC_ID_PCM_S16LE, diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index cc51af6e61..716853e6ca 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -598,7 +598,7 @@ get_video_packet: AVInputFormat ff_ea_demuxer = { .name = "ea", - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia Format"), + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts Multimedia"), .priv_data_size = sizeof(EaDemuxContext), .read_probe = ea_probe, .read_header = ea_read_header, diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 2149c8cdd7..c4ee22e73a 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -508,7 +508,7 @@ static int ffm_probe(AVProbeData *p) AVInputFormat ff_ffm_demuxer = { .name = "ffm", - .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"), + .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed)"), .priv_data_size = sizeof(FFMContext), .read_probe = ffm_probe, .read_header = ffm_read_header, diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 500ae0bf50..7de6ec8b34 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -239,7 +239,7 @@ static int ffm_write_trailer(AVFormatContext *s) AVOutputFormat ff_ffm_muxer = { .name = "ffm", - .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"), + .long_name = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed)"), .mime_type = "", .extensions = "ffm", .priv_data_size = sizeof(FFMContext), diff --git a/libavformat/ffmetadec.c b/libavformat/ffmetadec.c index 9774e946b2..69917d7604 100644 --- a/libavformat/ffmetadec.c +++ b/libavformat/ffmetadec.c @@ -168,7 +168,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_ffmetadata_demuxer = { .name = "ffmetadata", - .long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"), + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text"), .read_probe = probe, .read_header = read_header, .read_packet = read_packet, diff --git a/libavformat/ffmetaenc.c b/libavformat/ffmetaenc.c index 0aadb8a9cc..f75efea876 100644 --- a/libavformat/ffmetaenc.c +++ b/libavformat/ffmetaenc.c @@ -92,7 +92,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_ffmetadata_muxer = { .name = "ffmetadata", - .long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text format"), + .long_name = NULL_IF_CONFIG_SMALL("FFmpeg metadata in text"), .extensions = "ffmeta", .write_header = write_header, .write_packet = write_packet, diff --git a/libavformat/flic.c b/libavformat/flic.c index 849ec6912d..6c6c85ffee 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -262,7 +262,7 @@ static int flic_read_packet(AVFormatContext *s, AVInputFormat ff_flic_demuxer = { .name = "flic", - .long_name = NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation format"), + .long_name = NULL_IF_CONFIG_SMALL("FLI/FLC/FLX animation"), .priv_data_size = sizeof(FlicDemuxContext), .read_probe = flic_probe, .read_header = flic_read_header, diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index 36dfd297c6..3018b72626 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -37,7 +37,7 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_framecrc_muxer = { .name = "framecrc", - .long_name = NULL_IF_CONFIG_SMALL("framecrc testing format"), + .long_name = NULL_IF_CONFIG_SMALL("framecrc testing"), .extensions = "", .audio_codec = CODEC_ID_PCM_S16LE, .video_codec = CODEC_ID_RAWVIDEO, diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 415d01b480..e9ae10b066 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -77,7 +77,7 @@ static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_g723_1_demuxer = { .name = "g723_1", - .long_name = NULL_IF_CONFIG_SMALL("G.723.1 format"), + .long_name = NULL_IF_CONFIG_SMALL("G.723.1"), .read_header = g723_1_init, .read_packet = g723_1_read_packet, .extensions = "tco", diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c index f9086476d5..b741d78b03 100644 --- a/libavformat/h264dec.c +++ b/libavformat/h264dec.c @@ -67,4 +67,4 @@ static int h264_probe(AVProbeData *p) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(h264 , "raw H.264 video format", h264_probe, "h26l,h264,264", CODEC_ID_H264) +FF_DEF_RAWVIDEO_DEMUXER(h264 , "raw H.264 video", h264_probe, "h26l,h264,264", CODEC_ID_H264) diff --git a/libavformat/hls.c b/libavformat/hls.c index cda65cd362..1f6b7d56ed 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -742,7 +742,7 @@ static int hls_probe(AVProbeData *p) AVInputFormat ff_hls_demuxer = { .name = "hls,applehttp", - .long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming format"), + .long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming"), .priv_data_size = sizeof(HLSContext), .read_probe = hls_probe, .read_header = hls_read_header, diff --git a/libavformat/idcin.c b/libavformat/idcin.c index eb2cb8bf55..6a9b0ca2a9 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -293,7 +293,7 @@ static int idcin_read_packet(AVFormatContext *s, AVInputFormat ff_idcin_demuxer = { .name = "idcin", - .long_name = NULL_IF_CONFIG_SMALL("id Cinematic format"), + .long_name = NULL_IF_CONFIG_SMALL("id Cinematic"), .priv_data_size = sizeof(IdcinDemuxContext), .read_probe = idcin_probe, .read_header = idcin_read_header, diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c index be3122e789..b429b494f8 100644 --- a/libavformat/idroqdec.c +++ b/libavformat/idroqdec.c @@ -218,7 +218,7 @@ static int roq_read_packet(AVFormatContext *s, AVInputFormat ff_roq_demuxer = { .name = "roq", - .long_name = NULL_IF_CONFIG_SMALL("id RoQ format"), + .long_name = NULL_IF_CONFIG_SMALL("id RoQ"), .priv_data_size = sizeof(RoqDemuxContext), .read_probe = roq_probe, .read_header = roq_read_header, diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c index 394d16ff4d..df44bb67c4 100644 --- a/libavformat/idroqenc.c +++ b/libavformat/idroqenc.c @@ -37,7 +37,7 @@ static int roq_write_header(struct AVFormatContext *s) AVOutputFormat ff_roq_muxer = { .name = "roq", - .long_name = NULL_IF_CONFIG_SMALL("raw id RoQ format"), + .long_name = NULL_IF_CONFIG_SMALL("raw id RoQ"), .extensions = "roq", .audio_codec = CODEC_ID_ROQ_DPCM, .video_codec = CODEC_ID_ROQ, diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c index 33aed77163..b6be5abfbb 100644 --- a/libavformat/ilbc.c +++ b/libavformat/ilbc.c @@ -122,7 +122,7 @@ static int ilbc_read_packet(AVFormatContext *s, AVInputFormat ff_ilbc_demuxer = { .name = "ilbc", - .long_name = NULL_IF_CONFIG_SMALL("iLBC storage file format"), + .long_name = NULL_IF_CONFIG_SMALL("iLBC storage"), .read_probe = ilbc_probe, .read_header = ilbc_read_header, .read_packet = ilbc_read_packet, @@ -131,7 +131,7 @@ AVInputFormat ff_ilbc_demuxer = { AVOutputFormat ff_ilbc_muxer = { .name = "ilbc", - .long_name = NULL_IF_CONFIG_SMALL("iLBC storage file format"), + .long_name = NULL_IF_CONFIG_SMALL("iLBC storage"), .mime_type = "audio/iLBC", .extensions = "lbc", .audio_codec = CODEC_ID_ILBC, diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 152b40ec7b..5557fc9086 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -636,7 +636,7 @@ static int ipmovie_read_packet(AVFormatContext *s, AVInputFormat ff_ipmovie_demuxer = { .name = "ipmovie", - .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE format"), + .long_name = NULL_IF_CONFIG_SMALL("Interplay MVE"), .priv_data_size = sizeof(IPMVEContext), .read_probe = ipmovie_probe, .read_header = ipmovie_read_header, diff --git a/libavformat/iss.c b/libavformat/iss.c index b9848d3139..1fd9f552d8 100644 --- a/libavformat/iss.c +++ b/libavformat/iss.c @@ -124,7 +124,7 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_iss_demuxer = { .name = "iss", - .long_name = NULL_IF_CONFIG_SMALL("Funcom ISS format"), + .long_name = NULL_IF_CONFIG_SMALL("Funcom ISS"), .priv_data_size = sizeof(IssDemuxContext), .read_probe = iss_probe, .read_header = iss_read_header, diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c index 8daf7b45c4..e0c4e29486 100644 --- a/libavformat/lmlm4.c +++ b/libavformat/lmlm4.c @@ -120,7 +120,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) { AVInputFormat ff_lmlm4_demuxer = { .name = "lmlm4", - .long_name = NULL_IF_CONFIG_SMALL("lmlm4 raw format"), + .long_name = NULL_IF_CONFIG_SMALL("raw lmlm4"), .read_probe = lmlm4_probe, .read_header = lmlm4_read_header, .read_packet = lmlm4_read_packet, diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index bc95a0820e..22d80725d0 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -339,7 +339,7 @@ static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_lxf_demuxer = { .name = "lxf", - .long_name = NULL_IF_CONFIG_SMALL("VR native stream format (LXF)"), + .long_name = NULL_IF_CONFIG_SMALL("VR native stream (LXF)"), .priv_data_size = sizeof(LXFDemuxContext), .read_probe = lxf_probe, .read_header = lxf_read_header, diff --git a/libavformat/m4vdec.c b/libavformat/m4vdec.c index e856aadc10..02d26f6cce 100644 --- a/libavformat/m4vdec.c +++ b/libavformat/m4vdec.c @@ -49,4 +49,4 @@ static int mpeg4video_probe(AVProbeData *probe_packet) return 0; } -FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video format", mpeg4video_probe, "m4v", CODEC_ID_MPEG4) +FF_DEF_RAWVIDEO_DEMUXER(m4v, "raw MPEG-4 video", mpeg4video_probe, "m4v", CODEC_ID_MPEG4) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index da86ed343e..3ac0635ebb 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2160,7 +2160,7 @@ static int matroska_read_close(AVFormatContext *s) AVInputFormat ff_matroska_demuxer = { .name = "matroska,webm", - .long_name = NULL_IF_CONFIG_SMALL("Matroska/WebM file format"), + .long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"), .priv_data_size = sizeof(MatroskaDemuxContext), .read_probe = matroska_probe, .read_header = matroska_read_header, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4504d295ea..440bc4644a 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1288,7 +1288,7 @@ static int mkv_query_codec(enum CodecID codec_id, int std_compliance) #if CONFIG_MATROSKA_MUXER AVOutputFormat ff_matroska_muxer = { .name = "matroska", - .long_name = NULL_IF_CONFIG_SMALL("Matroska file format"), + .long_name = NULL_IF_CONFIG_SMALL("Matroska"), .mime_type = "video/x-matroska", .extensions = "mkv", .priv_data_size = sizeof(MatroskaMuxContext), @@ -1312,7 +1312,7 @@ AVOutputFormat ff_matroska_muxer = { #if CONFIG_WEBM_MUXER AVOutputFormat ff_webm_muxer = { .name = "webm", - .long_name = NULL_IF_CONFIG_SMALL("WebM file format"), + .long_name = NULL_IF_CONFIG_SMALL("WebM"), .mime_type = "video/webm", .extensions = "webm", .priv_data_size = sizeof(MatroskaMuxContext), @@ -1329,7 +1329,7 @@ AVOutputFormat ff_webm_muxer = { #if CONFIG_MATROSKA_AUDIO_MUXER AVOutputFormat ff_matroska_audio_muxer = { .name = "matroska", - .long_name = NULL_IF_CONFIG_SMALL("Matroska file format"), + .long_name = NULL_IF_CONFIG_SMALL("Matroska"), .mime_type = "audio/x-matroska", .extensions = "mka", .priv_data_size = sizeof(MatroskaMuxContext), diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c index 4e8db3cbe0..aaac5a97b2 100644 --- a/libavformat/md5enc.c +++ b/libavformat/md5enc.c @@ -68,7 +68,7 @@ static int write_trailer(struct AVFormatContext *s) AVOutputFormat ff_md5_muxer = { .name = "md5", - .long_name = NULL_IF_CONFIG_SMALL("MD5 testing format"), + .long_name = NULL_IF_CONFIG_SMALL("MD5 testing"), .extensions = "", .priv_data_size = PRIVSIZE, .audio_codec = CODEC_ID_PCM_S16LE, @@ -99,7 +99,7 @@ static int framemd5_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_framemd5_muxer = { .name = "framemd5", - .long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing format"), + .long_name = NULL_IF_CONFIG_SMALL("Per-frame MD5 testing"), .extensions = "", .priv_data_size = PRIVSIZE, .audio_codec = CODEC_ID_PCM_S16LE, diff --git a/libavformat/mm.c b/libavformat/mm.c index d25c978ac4..421c21641c 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -188,7 +188,7 @@ static int read_packet(AVFormatContext *s, AVInputFormat ff_mm_demuxer = { .name = "mm", - .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM format"), + .long_name = NULL_IF_CONFIG_SMALL("American Laser Games MM"), .priv_data_size = sizeof(MmDemuxContext), .read_probe = probe, .read_header = read_header, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a97045cfc5..3778e6bee1 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3357,7 +3357,7 @@ AVOutputFormat ff_ipod_muxer = { MOV_CLASS(ismv) AVOutputFormat ff_ismv_muxer = { .name = "ismv", - .long_name = NULL_IF_CONFIG_SMALL("ISMV/ISMA (Smooth Streaming) format"), + .long_name = NULL_IF_CONFIG_SMALL("ISMV/ISMA (Smooth Streaming)"), .mime_type = "application/mp4", .extensions = "ismv,isma", .priv_data_size = sizeof(MOVMuxContext), diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index ecb7cdaeb2..4a1630b1a4 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -1175,7 +1175,7 @@ AVOutputFormat ff_mpeg1vcd_muxer = { MPEGENC_CLASS(vob) AVOutputFormat ff_mpeg2vob_muxer = { .name = "vob", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"), + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (VOB)"), .mime_type = "video/mpeg", .extensions = "vob", .priv_data_size = sizeof(MpegMuxContext), @@ -1211,7 +1211,7 @@ AVOutputFormat ff_mpeg2svcd_muxer = { MPEGENC_CLASS(dvd) AVOutputFormat ff_mpeg2dvd_muxer = { .name = "dvd", - .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS format (DVD VOB)"), + .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 PS (DVD VOB)"), .mime_type = "video/mpeg", .extensions = "dvd", .priv_data_size = sizeof(MpegMuxContext), diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index 79cc272e27..01bc1d98c5 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -55,7 +55,7 @@ static int mpjpeg_write_trailer(AVFormatContext *s) AVOutputFormat ff_mpjpeg_muxer = { .name = "mpjpeg", - .long_name = NULL_IF_CONFIG_SMALL("MIME multipart JPEG format"), + .long_name = NULL_IF_CONFIG_SMALL("MIME multipart JPEG"), .mime_type = "multipart/x-mixed-replace;boundary=" BOUNDARY_TAG, .extensions = "mjpg", .audio_codec = CODEC_ID_NONE, diff --git a/libavformat/mtv.c b/libavformat/mtv.c index e917a1980c..8c77afe163 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -189,7 +189,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_mtv_demuxer = { .name = "mtv", - .long_name = NULL_IF_CONFIG_SMALL("MTV format"), + .long_name = NULL_IF_CONFIG_SMALL("MTV"), .priv_data_size = sizeof(MTVDemuxContext), .read_probe = mtv_probe, .read_header = mtv_read_header, diff --git a/libavformat/mvi.c b/libavformat/mvi.c index 673a712104..14685262be 100644 --- a/libavformat/mvi.c +++ b/libavformat/mvi.c @@ -126,7 +126,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_mvi_demuxer = { .name = "mvi", - .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels MVI format"), + .long_name = NULL_IF_CONFIG_SMALL("Motion Pixels MVI"), .priv_data_size = sizeof(MviDemuxContext), .read_header = read_header, .read_packet = read_packet, diff --git a/libavformat/mxg.c b/libavformat/mxg.c index cb983f1462..d0510d5fe5 100644 --- a/libavformat/mxg.c +++ b/libavformat/mxg.c @@ -241,7 +241,7 @@ static int mxg_close(struct AVFormatContext *s) AVInputFormat ff_mxg_demuxer = { .name = "mxg", - .long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"), + .long_name = NULL_IF_CONFIG_SMALL("MxPEG clip"), .priv_data_size = sizeof(MXGContext), .read_header = mxg_read_header, .read_packet = mxg_read_packet, diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c index cc8ae9593a..0bdd6157c3 100644 --- a/libavformat/ncdec.c +++ b/libavformat/ncdec.c @@ -93,7 +93,7 @@ static int nc_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_nc_demuxer = { .name = "nc", - .long_name = NULL_IF_CONFIG_SMALL("NC camera feed format"), + .long_name = NULL_IF_CONFIG_SMALL("NC camera feed"), .read_probe = nc_probe, .read_header = nc_read_header, .read_packet = nc_read_packet, diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c index eec6eee309..bb6671d518 100644 --- a/libavformat/nullenc.c +++ b/libavformat/nullenc.c @@ -28,7 +28,7 @@ static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_null_muxer = { .name = "null", - .long_name = NULL_IF_CONFIG_SMALL("raw null video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw null video"), .audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE), .video_codec = CODEC_ID_RAWVIDEO, .write_packet = null_write_packet, diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index f3cb4d8838..e78de7fce8 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -991,7 +991,7 @@ static int nut_read_close(AVFormatContext *s) AVInputFormat ff_nut_demuxer = { .name = "nut", - .long_name = NULL_IF_CONFIG_SMALL("NUT format"), + .long_name = NULL_IF_CONFIG_SMALL("NUT"), .priv_data_size = sizeof(NUTContext), .read_probe = nut_probe, .read_header = nut_read_header, diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 76d5852ce0..86c98bc86a 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -862,7 +862,7 @@ static int nut_write_trailer(AVFormatContext *s){ AVOutputFormat ff_nut_muxer = { .name = "nut", - .long_name = NULL_IF_CONFIG_SMALL("NUT format"), + .long_name = NULL_IF_CONFIG_SMALL("NUT"), .mime_type = "video/x-nut", .extensions = "nut", .priv_data_size = sizeof(NUTContext), diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 3939828ffb..0cf5f72100 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -264,7 +264,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { AVInputFormat ff_nuv_demuxer = { .name = "nuv", - .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo format"), + .long_name = NULL_IF_CONFIG_SMALL("NuppelVideo"), .priv_data_size = sizeof(NUVContext), .read_probe = nuv_probe, .read_header = nuv_header, diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 512bc0a21e..fce0418f37 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -74,62 +74,62 @@ AVInputFormat ff_pcm_ ## name_ ## _demuxer = { \ .priv_class = &name_ ## _demuxer_class, \ }; -PCMDEF(f64be, "PCM 64 bit floating-point big-endian format", +PCMDEF(f64be, "PCM 64-bit floating-point big-endian", NULL, CODEC_ID_PCM_F64BE) -PCMDEF(f64le, "PCM 64 bit floating-point little-endian format", +PCMDEF(f64le, "PCM 64-bit floating-point little-endian", NULL, CODEC_ID_PCM_F64LE) -PCMDEF(f32be, "PCM 32 bit floating-point big-endian format", +PCMDEF(f32be, "PCM 32-bit floating-point big-endian", NULL, CODEC_ID_PCM_F32BE) -PCMDEF(f32le, "PCM 32 bit floating-point little-endian format", +PCMDEF(f32le, "PCM 32-bit floating-point little-endian", NULL, CODEC_ID_PCM_F32LE) -PCMDEF(s32be, "PCM signed 32 bit big-endian format", +PCMDEF(s32be, "PCM signed 32-bit big-endian", NULL, CODEC_ID_PCM_S32BE) -PCMDEF(s32le, "PCM signed 32 bit little-endian format", +PCMDEF(s32le, "PCM signed 32-bit little-endian", NULL, CODEC_ID_PCM_S32LE) -PCMDEF(s24be, "PCM signed 24 bit big-endian format", +PCMDEF(s24be, "PCM signed 24-bit big-endian", NULL, CODEC_ID_PCM_S24BE) -PCMDEF(s24le, "PCM signed 24 bit little-endian format", +PCMDEF(s24le, "PCM signed 24-bit little-endian", NULL, CODEC_ID_PCM_S24LE) -PCMDEF(s16be, "PCM signed 16 bit big-endian format", +PCMDEF(s16be, "PCM signed 16-bit big-endian", AV_NE("sw", NULL), CODEC_ID_PCM_S16BE) -PCMDEF(s16le, "PCM signed 16 bit little-endian format", +PCMDEF(s16le, "PCM signed 16-bit little-endian", AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE) -PCMDEF(s8, "PCM signed 8 bit format", +PCMDEF(s8, "PCM signed 8-bit", "sb", CODEC_ID_PCM_S8) -PCMDEF(u32be, "PCM unsigned 32 bit big-endian format", +PCMDEF(u32be, "PCM unsigned 32-bit big-endian", NULL, CODEC_ID_PCM_U32BE) -PCMDEF(u32le, "PCM unsigned 32 bit little-endian format", +PCMDEF(u32le, "PCM unsigned 32-bit little-endian", NULL, CODEC_ID_PCM_U32LE) -PCMDEF(u24be, "PCM unsigned 24 bit big-endian format", +PCMDEF(u24be, "PCM unsigned 24-bit big-endian", NULL, CODEC_ID_PCM_U24BE) -PCMDEF(u24le, "PCM unsigned 24 bit little-endian format", +PCMDEF(u24le, "PCM unsigned 24-bit little-endian", NULL, CODEC_ID_PCM_U24LE) -PCMDEF(u16be, "PCM unsigned 16 bit big-endian format", +PCMDEF(u16be, "PCM unsigned 16-bit big-endian", AV_NE("uw", NULL), CODEC_ID_PCM_U16BE) -PCMDEF(u16le, "PCM unsigned 16 bit little-endian format", +PCMDEF(u16le, "PCM unsigned 16-bit little-endian", AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE) -PCMDEF(u8, "PCM unsigned 8 bit format", +PCMDEF(u8, "PCM unsigned 8-bit", "ub", CODEC_ID_PCM_U8) -PCMDEF(alaw, "PCM A-law format", +PCMDEF(alaw, "PCM A-law", "al", CODEC_ID_PCM_ALAW) -PCMDEF(mulaw, "PCM mu-law format", +PCMDEF(mulaw, "PCM mu-law", "ul", CODEC_ID_PCM_MULAW) diff --git a/libavformat/pcmenc.c b/libavformat/pcmenc.c index 553df1f877..34b1c53b40 100644 --- a/libavformat/pcmenc.c +++ b/libavformat/pcmenc.c @@ -33,62 +33,62 @@ AVOutputFormat ff_pcm_ ## name_ ## _muxer = { \ .flags = AVFMT_NOTIMESTAMPS, \ }; -PCMDEF(f64be, "PCM 64 bit floating-point big-endian format", +PCMDEF(f64be, "PCM 64-bit floating-point big-endian", NULL, CODEC_ID_PCM_F64BE) -PCMDEF(f64le, "PCM 64 bit floating-point little-endian format", +PCMDEF(f64le, "PCM 64-bit floating-point little-endian", NULL, CODEC_ID_PCM_F64LE) -PCMDEF(f32be, "PCM 32 bit floating-point big-endian format", +PCMDEF(f32be, "PCM 32-bit floating-point big-endian", NULL, CODEC_ID_PCM_F32BE) -PCMDEF(f32le, "PCM 32 bit floating-point little-endian format", +PCMDEF(f32le, "PCM 32-bit floating-point little-endian", NULL, CODEC_ID_PCM_F32LE) -PCMDEF(s32be, "PCM signed 32 bit big-endian format", +PCMDEF(s32be, "PCM signed 32-bit big-endian", NULL, CODEC_ID_PCM_S32BE) -PCMDEF(s32le, "PCM signed 32 bit little-endian format", +PCMDEF(s32le, "PCM signed 32-bit little-endian", NULL, CODEC_ID_PCM_S32LE) -PCMDEF(s24be, "PCM signed 24 bit big-endian format", +PCMDEF(s24be, "PCM signed 24-bit big-endian", NULL, CODEC_ID_PCM_S24BE) -PCMDEF(s24le, "PCM signed 24 bit little-endian format", +PCMDEF(s24le, "PCM signed 24-bit little-endian", NULL, CODEC_ID_PCM_S24LE) -PCMDEF(s16be, "PCM signed 16 bit big-endian format", +PCMDEF(s16be, "PCM signed 16-bit big-endian", AV_NE("sw", NULL), CODEC_ID_PCM_S16BE) -PCMDEF(s16le, "PCM signed 16 bit little-endian format", +PCMDEF(s16le, "PCM signed 16-bit little-endian", AV_NE(NULL, "sw"), CODEC_ID_PCM_S16LE) -PCMDEF(s8, "PCM signed 8 bit format", +PCMDEF(s8, "PCM signed 8-bit", "sb", CODEC_ID_PCM_S8) -PCMDEF(u32be, "PCM unsigned 32 bit big-endian format", +PCMDEF(u32be, "PCM unsigned 32-bit big-endian", NULL, CODEC_ID_PCM_U32BE) -PCMDEF(u32le, "PCM unsigned 32 bit little-endian format", +PCMDEF(u32le, "PCM unsigned 32-bit little-endian", NULL, CODEC_ID_PCM_U32LE) -PCMDEF(u24be, "PCM unsigned 24 bit big-endian format", +PCMDEF(u24be, "PCM unsigned 24-bit big-endian", NULL, CODEC_ID_PCM_U24BE) -PCMDEF(u24le, "PCM unsigned 24 bit little-endian format", +PCMDEF(u24le, "PCM unsigned 24-bit little-endian", NULL, CODEC_ID_PCM_U24LE) -PCMDEF(u16be, "PCM unsigned 16 bit big-endian format", +PCMDEF(u16be, "PCM unsigned 16-bit big-endian", AV_NE("uw", NULL), CODEC_ID_PCM_U16BE) -PCMDEF(u16le, "PCM unsigned 16 bit little-endian format", +PCMDEF(u16le, "PCM unsigned 16-bit little-endian", AV_NE(NULL, "uw"), CODEC_ID_PCM_U16LE) -PCMDEF(u8, "PCM unsigned 8 bit format", +PCMDEF(u8, "PCM unsigned 8-bit", "ub", CODEC_ID_PCM_U8) -PCMDEF(alaw, "PCM A-law format", +PCMDEF(alaw, "PCM A-law", "al", CODEC_ID_PCM_ALAW) -PCMDEF(mulaw, "PCM mu-law format", +PCMDEF(mulaw, "PCM mu-law", "ul", CODEC_ID_PCM_MULAW) diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c index 9df39be0a1..ca3b33597a 100644 --- a/libavformat/pmpdec.c +++ b/libavformat/pmpdec.c @@ -170,7 +170,7 @@ static int pmp_close(AVFormatContext *s) AVInputFormat ff_pmp_demuxer = { .name = "pmp", - .long_name = NULL_IF_CONFIG_SMALL("Playstation Portable PMP format"), + .long_name = NULL_IF_CONFIG_SMALL("Playstation Portable PMP"), .priv_data_size = sizeof(PMPContext), .read_probe = pmp_probe, .read_header = pmp_header, diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 6405c246bd..f49e356a4b 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -262,7 +262,7 @@ static int str_read_close(AVFormatContext *s) AVInputFormat ff_str_demuxer = { .name = "psxstr", - .long_name = NULL_IF_CONFIG_SMALL("Sony Playstation STR format"), + .long_name = NULL_IF_CONFIG_SMALL("Sony Playstation STR"), .priv_data_size = sizeof(StrDemuxContext), .read_probe = str_probe, .read_header = str_read_header, diff --git a/libavformat/pva.c b/libavformat/pva.c index 064f4039cc..bfb6987c28 100644 --- a/libavformat/pva.c +++ b/libavformat/pva.c @@ -203,7 +203,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index, AVInputFormat ff_pva_demuxer = { .name = "pva", - .long_name = NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"), + .long_name = NULL_IF_CONFIG_SMALL("TechnoTrend PVA"), .priv_data_size = sizeof(PVAContext), .read_probe = pva_probe, .read_header = pva_read_header, diff --git a/libavformat/qcp.c b/libavformat/qcp.c index 6545a1cdfd..de04906502 100644 --- a/libavformat/qcp.c +++ b/libavformat/qcp.c @@ -188,7 +188,7 @@ static int qcp_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_qcp_demuxer = { .name = "qcp", - .long_name = NULL_IF_CONFIG_SMALL("QCP format"), + .long_name = NULL_IF_CONFIG_SMALL("QCP"), .priv_data_size = sizeof(QCPContext), .read_probe = qcp_probe, .read_header = qcp_read_header, diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 1795631bea..a5e5d1c4f6 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -396,7 +396,7 @@ static int r3d_close(AVFormatContext *s) AVInputFormat ff_r3d_demuxer = { .name = "r3d", - .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D format"), + .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D"), .priv_data_size = sizeof(R3DContext), .read_probe = r3d_probe, .read_header = r3d_read_header, diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index e46fe64d5a..fde5b24e65 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -161,7 +161,7 @@ AVOutputFormat ff_h263_muxer = { #if CONFIG_H264_MUXER AVOutputFormat ff_h264_muxer = { .name = "h264", - .long_name = NULL_IF_CONFIG_SMALL("raw H.264 video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw H.264 video"), .extensions = "h264", .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_H264, @@ -173,7 +173,7 @@ AVOutputFormat ff_h264_muxer = { #if CONFIG_M4V_MUXER AVOutputFormat ff_m4v_muxer = { .name = "m4v", - .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-4 video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-4 video"), .extensions = "m4v", .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MPEG4, @@ -235,7 +235,7 @@ AVOutputFormat ff_mpeg2video_muxer = { #if CONFIG_RAWVIDEO_MUXER AVOutputFormat ff_rawvideo_muxer = { .name = "rawvideo", - .long_name = NULL_IF_CONFIG_SMALL("raw video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw video"), .extensions = "yuv,rgb", .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_RAWVIDEO, @@ -247,7 +247,7 @@ AVOutputFormat ff_rawvideo_muxer = { #if CONFIG_SRT_MUXER AVOutputFormat ff_srt_muxer = { .name = "srt", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), .mime_type = "application/x-subrip", .extensions = "srt", .write_packet = ff_raw_write_packet, diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index c27cd7c5db..5c1593e3c1 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -62,7 +62,7 @@ static const AVClass rawvideo_demuxer_class = { AVInputFormat ff_rawvideo_demuxer = { .name = "rawvideo", - .long_name = NULL_IF_CONFIG_SMALL("raw video format"), + .long_name = NULL_IF_CONFIG_SMALL("raw video"), .priv_data_size = sizeof(FFRawVideoDemuxerContext), .read_header = ff_raw_read_header, .read_packet = rawvideo_read_packet, diff --git a/libavformat/rl2.c b/libavformat/rl2.c index d84b8b9fd6..2f0ef118ae 100644 --- a/libavformat/rl2.c +++ b/libavformat/rl2.c @@ -286,7 +286,7 @@ static int rl2_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp AVInputFormat ff_rl2_demuxer = { .name = "rl2", - .long_name = NULL_IF_CONFIG_SMALL("RL2 format"), + .long_name = NULL_IF_CONFIG_SMALL("RL2"), .priv_data_size = sizeof(Rl2DemuxContext), .read_probe = rl2_probe, .read_header = rl2_read_header, diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 05a7c59f45..484a986553 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -983,7 +983,7 @@ static int64_t rm_read_dts(AVFormatContext *s, int stream_index, AVInputFormat ff_rm_demuxer = { .name = "rm", - .long_name = NULL_IF_CONFIG_SMALL("RealMedia format"), + .long_name = NULL_IF_CONFIG_SMALL("RealMedia"), .priv_data_size = sizeof(RMDemuxContext), .read_probe = rm_probe, .read_header = rm_read_header, diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index a6df21b432..4b33964234 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -462,7 +462,7 @@ static int rm_write_trailer(AVFormatContext *s) AVOutputFormat ff_rm_muxer = { .name = "rm", - .long_name = NULL_IF_CONFIG_SMALL("RealMedia format"), + .long_name = NULL_IF_CONFIG_SMALL("RealMedia"), .mime_type = "application/vnd.rn-realmedia", .extensions = "rm,ra", .priv_data_size = sizeof(RMMuxContext), diff --git a/libavformat/rpl.c b/libavformat/rpl.c index 3454fbe491..07d6895ee2 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -353,7 +353,7 @@ static int rpl_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_rpl_demuxer = { .name = "rpl", - .long_name = NULL_IF_CONFIG_SMALL("RPL/ARMovie format"), + .long_name = NULL_IF_CONFIG_SMALL("RPL / ARMovie"), .priv_data_size = sizeof(RPLContext), .read_probe = rpl_probe, .read_header = rpl_read_header, diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c index 72c12e7421..eed81af884 100644 --- a/libavformat/rsodec.c +++ b/libavformat/rsodec.c @@ -90,7 +90,7 @@ static int rso_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_rso_demuxer = { .name = "rso", - .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"), + .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO"), .extensions = "rso", .read_header = rso_read_header, .read_packet = rso_read_packet, diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index f338d0df4e..eabb2d5635 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -102,7 +102,7 @@ static int rso_write_trailer(AVFormatContext *s) AVOutputFormat ff_rso_muxer = { .name = "rso", - .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"), + .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO"), .extensions = "rso", .audio_codec = CODEC_ID_PCM_U8, .video_codec = CODEC_ID_NONE, diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index d0b17e0970..d173cf3eb3 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -546,7 +546,7 @@ static int rtp_write_trailer(AVFormatContext *s1) AVOutputFormat ff_rtp_muxer = { .name = "rtp", - .long_name = NULL_IF_CONFIG_SMALL("RTP output format"), + .long_name = NULL_IF_CONFIG_SMALL("RTP output"), .priv_data_size = sizeof(RTPMuxContext), .audio_codec = CODEC_ID_PCM_MULAW, .video_codec = CODEC_ID_MPEG4, diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 4cf7a90329..4b1e804805 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2081,7 +2081,7 @@ static const AVClass rtp_demuxer_class = { AVInputFormat ff_rtp_demuxer = { .name = "rtp", - .long_name = NULL_IF_CONFIG_SMALL("RTP input format"), + .long_name = NULL_IF_CONFIG_SMALL("RTP input"), .priv_data_size = sizeof(RTSPState), .read_probe = rtp_probe, .read_header = rtp_read_header, diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index a125cc6e9e..a891837eb1 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -919,7 +919,7 @@ static const AVClass rtsp_demuxer_class = { AVInputFormat ff_rtsp_demuxer = { .name = "rtsp", - .long_name = NULL_IF_CONFIG_SMALL("RTSP input format"), + .long_name = NULL_IF_CONFIG_SMALL("RTSP input"), .priv_data_size = sizeof(RTSPState), .read_probe = rtsp_probe, .read_header = rtsp_read_header, diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index 902076d25d..1d4780fa9e 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -235,7 +235,7 @@ static int rtsp_write_close(AVFormatContext *s) AVOutputFormat ff_rtsp_muxer = { .name = "rtsp", - .long_name = NULL_IF_CONFIG_SMALL("RTSP output format"), + .long_name = NULL_IF_CONFIG_SMALL("RTSP output"), .priv_data_size = sizeof(RTSPState), .audio_codec = CODEC_ID_AAC, .video_codec = CODEC_ID_MPEG4, diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index e377cefda9..c1cdc8fb72 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -227,7 +227,7 @@ static int sap_fetch_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_sap_demuxer = { .name = "sap", - .long_name = NULL_IF_CONFIG_SMALL("SAP input format"), + .long_name = NULL_IF_CONFIG_SMALL("SAP input"), .priv_data_size = sizeof(struct SAPState), .read_probe = sap_probe, .read_header = sap_read_header, diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 235c71105c..37ce0e5eea 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -254,7 +254,7 @@ static int sap_write_packet(AVFormatContext *s, AVPacket *pkt) AVOutputFormat ff_sap_muxer = { .name = "sap", - .long_name = NULL_IF_CONFIG_SMALL("SAP output format"), + .long_name = NULL_IF_CONFIG_SMALL("SAP output"), .priv_data_size = sizeof(struct SAPState), .audio_codec = CODEC_ID_AAC, .video_codec = CODEC_ID_MPEG4, diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 23cb3ed1ed..bb26cf69e4 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -324,7 +324,7 @@ static int film_read_close(AVFormatContext *s) AVInputFormat ff_segafilm_demuxer = { .name = "film_cpk", - .long_name = NULL_IF_CONFIG_SMALL("Sega FILM/CPK format"), + .long_name = NULL_IF_CONFIG_SMALL("Sega FILM / CPK"), .priv_data_size = sizeof(FilmDemuxContext), .read_probe = film_probe, .read_header = film_read_header, diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 48b192e04c..300d43596d 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -282,7 +282,7 @@ static int vmd_read_close(AVFormatContext *s) AVInputFormat ff_vmd_demuxer = { .name = "vmd", - .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD format"), + .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD"), .priv_data_size = sizeof(VmdDemuxContext), .read_probe = vmd_probe, .read_header = vmd_read_header, diff --git a/libavformat/sol.c b/libavformat/sol.c index d02373c65a..ed1e41b07d 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -143,7 +143,7 @@ static int sol_read_packet(AVFormatContext *s, AVInputFormat ff_sol_demuxer = { .name = "sol", - .long_name = NULL_IF_CONFIG_SMALL("Sierra SOL format"), + .long_name = NULL_IF_CONFIG_SMALL("Sierra SOL"), .read_probe = sol_probe, .read_header = sol_read_header, .read_packet = sol_read_packet, diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c index 6ce1848539..d116b2c9c4 100644 --- a/libavformat/soxdec.c +++ b/libavformat/soxdec.c @@ -144,7 +144,7 @@ static int sox_read_packet(AVFormatContext *s, AVInputFormat ff_sox_demuxer = { .name = "sox", - .long_name = NULL_IF_CONFIG_SMALL("SoX native format"), + .long_name = NULL_IF_CONFIG_SMALL("SoX native"), .read_probe = sox_probe, .read_header = sox_read_header, .read_packet = sox_read_packet, diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c index 55d5bd98c0..750a0a05a8 100644 --- a/libavformat/soxenc.c +++ b/libavformat/soxenc.c @@ -117,7 +117,7 @@ static int sox_write_trailer(AVFormatContext *s) AVOutputFormat ff_sox_muxer = { .name = "sox", - .long_name = NULL_IF_CONFIG_SMALL("SoX native format"), + .long_name = NULL_IF_CONFIG_SMALL("SoX native"), .extensions = "sox", .priv_data_size = sizeof(SoXContext), .audio_codec = CODEC_ID_PCM_S32LE, diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c index d170f9f856..8d951f8f0a 100644 --- a/libavformat/srtdec.c +++ b/libavformat/srtdec.c @@ -94,7 +94,7 @@ static int srt_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_srt_demuxer = { .name = "srt", - .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle format"), + .long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"), .read_probe = srt_probe, .read_header = srt_read_header, .read_packet = srt_read_packet, diff --git a/libavformat/tiertexseq.c b/libavformat/tiertexseq.c index df7c38d0d2..45a8482ab9 100644 --- a/libavformat/tiertexseq.c +++ b/libavformat/tiertexseq.c @@ -306,7 +306,7 @@ static int seq_read_close(AVFormatContext *s) AVInputFormat ff_tiertexseq_demuxer = { .name = "tiertexseq", - .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ format"), + .long_name = NULL_IF_CONFIG_SMALL("Tiertex Limited SEQ"), .priv_data_size = sizeof(SeqDemuxContext), .read_probe = seq_probe, .read_header = seq_read_header, diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index ffb165598a..7a7c8b6762 100644 --- a/libavformat/vc1test.c +++ b/libavformat/vc1test.c @@ -111,7 +111,7 @@ static int vc1t_read_packet(AVFormatContext *s, AVInputFormat ff_vc1t_demuxer = { .name = "vc1test", - .long_name = NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"), + .long_name = NULL_IF_CONFIG_SMALL("VC-1 test bitstream"), .read_probe = vc1t_probe, .read_header = vc1t_read_header, .read_packet = vc1t_read_packet, diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index b0af480a9e..77f4247010 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -166,7 +166,7 @@ static int voc_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_voc_demuxer = { .name = "voc", - .long_name = NULL_IF_CONFIG_SMALL("Creative Voice file format"), + .long_name = NULL_IF_CONFIG_SMALL("Creative Voice"), .priv_data_size = sizeof(VocDecContext), .read_probe = voc_probe, .read_header = voc_read_header, diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 30e38bfeba..06d88a8c5f 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -91,7 +91,7 @@ static int voc_write_trailer(AVFormatContext *s) AVOutputFormat ff_voc_muxer = { .name = "voc", - .long_name = NULL_IF_CONFIG_SMALL("Creative Voice file format"), + .long_name = NULL_IF_CONFIG_SMALL("Creative Voice"), .mime_type = "audio/x-voc", .extensions = "voc", .priv_data_size = sizeof(VocEncContext), diff --git a/libavformat/wav.c b/libavformat/wav.c index 1bfe6d5eb6..4ff2c389fc 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -676,7 +676,7 @@ static int w64_read_header(AVFormatContext *s) AVInputFormat ff_w64_demuxer = { .name = "w64", - .long_name = NULL_IF_CONFIG_SMALL("Sony Wave64 format"), + .long_name = NULL_IF_CONFIG_SMALL("Sony Wave64"), .priv_data_size = sizeof(WAVContext), .read_probe = w64_probe, .read_header = w64_read_header, diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index 05e25fc44d..e4fefcff1c 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -293,7 +293,7 @@ static int wc3_read_close(AVFormatContext *s) AVInputFormat ff_wc3_demuxer = { .name = "wc3movie", - .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III movie format"), + .long_name = NULL_IF_CONFIG_SMALL("Wing Commander III movie"), .priv_data_size = sizeof(Wc3DemuxContext), .read_probe = wc3_probe, .read_header = wc3_read_header, diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c index a7148eb08b..ae49184a47 100644 --- a/libavformat/westwood_aud.c +++ b/libavformat/westwood_aud.c @@ -173,7 +173,7 @@ static int wsaud_read_packet(AVFormatContext *s, AVInputFormat ff_wsaud_demuxer = { .name = "wsaud", - .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio format"), + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios audio"), .read_probe = wsaud_probe, .read_header = wsaud_read_header, .read_packet = wsaud_read_packet, diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c index 41aa5d897f..c431d5356c 100644 --- a/libavformat/westwood_vqa.c +++ b/libavformat/westwood_vqa.c @@ -273,7 +273,7 @@ static int wsvqa_read_packet(AVFormatContext *s, AVInputFormat ff_wsvqa_demuxer = { .name = "wsvqa", - .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA format"), + .long_name = NULL_IF_CONFIG_SMALL("Westwood Studios VQA"), .priv_data_size = sizeof(WsVqaDemuxContext), .read_probe = wsvqa_probe, .read_header = wsvqa_read_header, diff --git a/libavformat/xa.c b/libavformat/xa.c index 09ef17ff35..4c209656b2 100644 --- a/libavformat/xa.c +++ b/libavformat/xa.c @@ -120,7 +120,7 @@ static int xa_read_packet(AVFormatContext *s, AVInputFormat ff_xa_demuxer = { .name = "xa", - .long_name = NULL_IF_CONFIG_SMALL("Maxis XA File Format"), + .long_name = NULL_IF_CONFIG_SMALL("Maxis XA"), .priv_data_size = sizeof(MaxisXADemuxContext), .read_probe = xa_probe, .read_header = xa_read_header, diff --git a/libavformat/yop.c b/libavformat/yop.c index ba49830992..bffbe18175 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -206,7 +206,7 @@ static int yop_read_seek(AVFormatContext *s, int stream_index, AVInputFormat ff_yop_demuxer = { .name = "yop", - .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Format"), + .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP"), .priv_data_size = sizeof(YopDecContext), .read_probe = yop_probe, .read_header = yop_read_header, diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index fef6aa0172..f4a9c60168 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -174,7 +174,7 @@ static int yuv4_write_header(AVFormatContext *s) AVOutputFormat ff_yuv4mpegpipe_muxer = { .name = "yuv4mpegpipe", - .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), + .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe"), .mime_type = "", .extensions = "y4m", .priv_data_size = sizeof(int), @@ -414,7 +414,7 @@ static int yuv4_probe(AVProbeData *pd) #if CONFIG_YUV4MPEGPIPE_DEMUXER AVInputFormat ff_yuv4mpegpipe_demuxer = { .name = "yuv4mpegpipe", - .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"), + .long_name = NULL_IF_CONFIG_SMALL("YUV4MPEG pipe"), .priv_data_size = sizeof(struct frame_attributes), .read_probe = yuv4_probe, .read_header = yuv4_read_header, |