avformat: Drop pointless "format" from container long names

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,

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,

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,

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,

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),

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,

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,

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",

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,

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,

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,

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,

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,

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,

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,

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,

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),

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,

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,

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,

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,

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",

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)

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,

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,

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,

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,

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,

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,

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,

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,

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,

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)

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,

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),

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,

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,

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),

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),

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,

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,

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,

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,

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,

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,

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,

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),

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,

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)

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)

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,