@@ -2867,7 +2867,7 @@ AVCodec ff_aac_latm_decoder = {

     .init            = latm_decode_init,

     .close           = aac_decode_close,

     .decode          = latm_decode_frame,

-    .long_name       = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Codec LATM syntax)"),

+    .long_name       = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Coding LATM syntax)"),

     .sample_fmts     = (const enum AVSampleFormat[]) {

         AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE

     },

@@ -828,6 +828,6 @@ AVCodec ff_aac_encoder = {

                       CODEC_CAP_EXPERIMENTAL,

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,

                                                      AV_SAMPLE_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),

+    .long_name      = NULL_IF_CONFIG_SMALL("AAC (Advanced Audio Coding)"),

     .priv_class     = &aacenc_class,

 };

@@ -1062,7 +1062,7 @@ AVCodec ff_amrnb_decoder = {

     .init           = amrnb_decode_init,

     .decode         = amrnb_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"),

+    .long_name      = NULL_IF_CONFIG_SMALL("AMR-NB (Adaptive Multi-Rate NarrowBand)"),

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,

                                                      AV_SAMPLE_FMT_NONE },

 };

@@ -1242,7 +1242,7 @@ AVCodec ff_amrwb_decoder = {

     .init           = amrwb_decode_init,

     .decode         = amrwb_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"),

+    .long_name      = NULL_IF_CONFIG_SMALL("AMR-WB (Adaptive Multi-Rate WideBand)"),

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,

                                                      AV_SAMPLE_FMT_NONE },

 };

@@ -54,7 +54,7 @@ static int ass_decode_frame(AVCodecContext *avctx, void *data, int *got_sub_ptr,

 AVCodec ff_ass_decoder = {

     .name         = "ass",

-    .long_name    = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),

+    .long_name    = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),

     .type         = AVMEDIA_TYPE_SUBTITLE,

     .id           = CODEC_ID_SSA,

     .init         = ass_decode_init,

@@ -59,7 +59,7 @@ static int ass_encode_frame(AVCodecContext *avctx,

 AVCodec ff_ass_encoder = {

     .name         = "ass",

-    .long_name    = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle"),

+    .long_name    = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),

     .type         = AVMEDIA_TYPE_SUBTITLE,

     .id           = CODEC_ID_SSA,

     .init         = ass_encode_init,

@@ -370,5 +370,5 @@ AVCodec ff_bmp_decoder = {

     .close          = bmp_decode_end,

     .decode         = bmp_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("BMP image"),

+    .long_name      = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),

 };

@@ -173,5 +173,5 @@ AVCodec ff_bmp_encoder = {

         PIX_FMT_MONOBLACK,

         PIX_FMT_NONE

     },

-    .long_name      = NULL_IF_CONFIG_SMALL("BMP image"),

+    .long_name      = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"),

 };

@@ -725,5 +725,5 @@ AVCodec ff_cavs_decoder = {

     .decode         = cavs_decode_frame,

     .capabilities   = CODEC_CAP_DR1 | CODEC_CAP_DELAY,

     .flush          = cavs_flush,

-    .long_name      = NULL_IF_CONFIG_SMALL("Chinese AVS video (AVS1-P2, JiZhun profile)"),

+    .long_name      = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),

 };

@@ -1303,5 +1303,5 @@ AVCodec ff_cook_decoder = {

     .close          = cook_decode_close,

     .decode         = cook_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("COOK"),

+    .long_name      = NULL_IF_CONFIG_SMALL("Cook / Cooker / Gecko (RealAudio G2)"),

 };

@@ -127,6 +127,6 @@ AVCodec ff_flv_decoder = {

     .close          = ff_h263_decode_end,

     .decode         = ff_h263_decode_frame,

     .capabilities   = CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),

+    .long_name      = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),

     .pix_fmts       = ff_pixfmt_list_420,

 };

@@ -95,6 +95,6 @@ AVCodec ff_flv_encoder = {

     .encode2        = ff_MPV_encode_picture,

     .close          = ff_MPV_encode_end,

     .pix_fmts       = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"),

+    .long_name      = NULL_IF_CONFIG_SMALL("FLV / Sorenson Spark / Sorenson H.263 (Flash Video)"),

     .priv_class     = &flv_class,

 };

@@ -246,7 +246,7 @@ AVCodec ff_libfaac_encoder = {

     .capabilities   = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,

                                                      AV_SAMPLE_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"),

+    .long_name      = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Coding)"),

     .profiles       = NULL_IF_CONFIG_SMALL(profiles),

     .channel_layouts = faac_channel_layouts,

 };

@@ -111,7 +111,7 @@ AVCodec ff_libilbc_decoder = {

     .init           = ilbc_decode_init,

     .decode         = ilbc_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("Internet Low Bitrate Codec (iLBC)"),

+    .long_name      = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),

     .priv_class     = &ilbc_dec_class,

 };

@@ -203,7 +203,7 @@ AVCodec ff_libilbc_encoder = {

     .close          = ilbc_encode_close,

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,

                                                      AV_SAMPLE_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("Internet Low Bitrate Codec (iLBC)"),

+    .long_name      = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),

     .defaults       = ilbc_encode_defaults,

     .priv_class     = &ilbc_enc_class,

 };

@@ -180,7 +180,7 @@ AVCodec ff_libopencore_amrnb_decoder = {

     .close          = amr_nb_decode_close,

     .decode         = amr_nb_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),

+    .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),

 };

 static av_cold int amr_nb_encode_init(AVCodecContext *avctx)

@@ -299,7 +299,7 @@ AVCodec ff_libopencore_amrnb_encoder = {

     .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_SMALL_LAST_FRAME,

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,

                                                      AV_SAMPLE_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band"),

+    .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE AMR-NB (Adaptive Multi-Rate Narrow-Band)"),

     .priv_class     = &class,

 };

@@ -386,7 +386,7 @@ AVCodec ff_libopencore_amrwb_decoder = {

     .close          = amr_wb_decode_close,

     .decode         = amr_wb_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE Adaptive Multi-Rate (AMR) Wide-Band"),

+    .long_name      = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"),

 };

 #endif /* CONFIG_LIBOPENCORE_AMRWB */

@@ -452,7 +452,7 @@ AVCodec ff_libopenjpeg_decoder = {

     .close            = libopenjpeg_decode_close,

     .decode           = libopenjpeg_decode_frame,

     .capabilities     = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,

-    .long_name        = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"),

+    .long_name        = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"),

     .priv_class       = &class,

     .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy),

 };

@@ -198,5 +198,5 @@ AVCodec ff_libvo_aacenc_encoder = {

     .capabilities   = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,

                                                      AV_SAMPLE_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn AAC"),

+    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn AAC (Advanced Audio Coding)"),

 };

@@ -150,7 +150,7 @@ AVCodec ff_libvo_amrwbenc_encoder = {

     .close          = amr_wb_encode_close,

     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,

                                                      AV_SAMPLE_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive "

-                                           "Multi-Rate (AMR) Wide-Band"),

+    .long_name      = NULL_IF_CONFIG_SMALL("Android VisualOn AMR-WB "

+                                           "(Adaptive Multi-Rate Wide-Band)"),

     .priv_class     = &class,

 };

@@ -426,7 +426,7 @@ AVCodec ff_libxavs_encoder = {

     .close          = XAVS_close,

     .capabilities   = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS,

     .pix_fmts       = (const enum PixelFormat[]) { PIX_FMT_YUV420P, PIX_FMT_NONE },

-    .long_name      = NULL_IF_CONFIG_SMALL("libxavs - the Chinese Audio Video Standard Encoder"),

+    .long_name      = NULL_IF_CONFIG_SMALL("libxavs Chinese AVS (Audio Video Standard)"),

     .priv_class     = &class,

     .defaults       = xavs_defaults,

 };

@@ -475,5 +475,5 @@ AVCodec ff_tta_decoder = {

     .close          = tta_decode_close,

     .decode         = tta_decode_frame,

     .capabilities   = CODEC_CAP_DR1,

-    .long_name      = NULL_IF_CONFIG_SMALL("True Audio (TTA)"),

+    .long_name      = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),

 };

@@ -296,7 +296,7 @@ static const AVClass oss_demuxer_class = {

 AVInputFormat ff_oss_demuxer = {

     .name           = "oss",

-    .long_name      = NULL_IF_CONFIG_SMALL("Open Sound System capture"),

+    .long_name      = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) capture"),

     .priv_data_size = sizeof(AudioData),

     .read_header    = audio_read_header,

     .read_packet    = audio_read_packet,

@@ -309,7 +309,7 @@ AVInputFormat ff_oss_demuxer = {

 #if CONFIG_OSS_OUTDEV

 AVOutputFormat ff_oss_muxer = {

     .name           = "oss",

-    .long_name      = NULL_IF_CONFIG_SMALL("Open Sound System playback"),

+    .long_name      = NULL_IF_CONFIG_SMALL("OSS (Open Sound System) playback"),

     .priv_data_size = sizeof(AudioData),

     /* XXX: we make the assumption that the soundcard accepts this format */

     /* XXX: find better solution with "preinit" method, needed also in

@@ -83,7 +83,7 @@ static int adts_aac_read_header(AVFormatContext *s)

 AVInputFormat ff_aac_demuxer = {

     .name           = "aac",

-    .long_name      = NULL_IF_CONFIG_SMALL("raw ADTS AAC"),

+    .long_name      = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"),

     .read_probe     = adts_aac_probe,

     .read_header    = adts_aac_read_header,

     .read_packet    = ff_raw_read_partial_packet,

@@ -165,7 +165,7 @@ static int adts_write_packet(AVFormatContext *s, AVPacket *pkt)

 AVOutputFormat ff_adts_muxer = {

     .name              = "adts",

-    .long_name         = NULL_IF_CONFIG_SMALL("ADTS AAC"),

+    .long_name         = NULL_IF_CONFIG_SMALL("ADTS AAC (Advanced Audio Coding)"),

     .mime_type         = "audio/aac",

     .extensions        = "aac,adts",

     .priv_data_size    = sizeof(ADTSContext),

@@ -1401,7 +1401,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int

 AVInputFormat ff_asf_demuxer = {

     .name           = "asf",

-    .long_name      = NULL_IF_CONFIG_SMALL("ASF format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),

     .priv_data_size = sizeof(ASFContext),

     .read_probe     = asf_probe,

     .read_header    = asf_read_header,

@@ -880,7 +880,7 @@ static int asf_write_trailer(AVFormatContext *s)

 #if CONFIG_ASF_MUXER

 AVOutputFormat ff_asf_muxer = {

     .name           = "asf",

-    .long_name      = NULL_IF_CONFIG_SMALL("ASF format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),

     .mime_type      = "video/x-ms-asf",

     .extensions     = "asf,wmv,wma",

     .priv_data_size = sizeof(ASFContext),

@@ -899,7 +899,7 @@ AVOutputFormat ff_asf_muxer = {

 #if CONFIG_ASF_STREAM_MUXER

 AVOutputFormat ff_asf_stream_muxer = {

     .name           = "asf_stream",

-    .long_name      = NULL_IF_CONFIG_SMALL("ASF format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("ASF (Advanced / Active Streaming Format)"),

     .mime_type      = "video/x-ms-asf",

     .extensions     = "asf,wmv,wma",

     .priv_data_size = sizeof(ASFContext),

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

+    .long_name      = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),

     .priv_data_size = sizeof(ASSContext),

     .read_probe     = probe,

     .read_header    = read_header,

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

+    .long_name      = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),

     .mime_type      = "text/x-ssa",

     .extensions     = "ass,ssa",

     .priv_data_size = sizeof(ASSContext),

@@ -191,7 +191,7 @@ static int au_read_packet(AVFormatContext *s,

 #if CONFIG_AU_DEMUXER

 AVInputFormat ff_au_demuxer = {

     .name           = "au",

-    .long_name      = NULL_IF_CONFIG_SMALL("SUN AU format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("Sun AU"),

     .read_probe     = au_probe,

     .read_header    = au_read_header,

     .read_packet    = au_read_packet,

@@ -203,7 +203,7 @@ AVInputFormat ff_au_demuxer = {

 #if CONFIG_AU_MUXER

 AVOutputFormat ff_au_muxer = {

     .name              = "au",

-    .long_name         = NULL_IF_CONFIG_SMALL("SUN AU format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("Sun AU"),

     .mime_type         = "audio/basic",

     .extensions        = "au",

     .audio_codec       = CODEC_ID_PCM_S16BE,

@@ -1393,7 +1393,7 @@ static int avi_probe(AVProbeData *p)

 AVInputFormat ff_avi_demuxer = {

     .name           = "avi",

-    .long_name      = NULL_IF_CONFIG_SMALL("AVI format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("AVI (Audio Video Interleaved)"),

     .priv_data_size = sizeof(AVIContext),

     .read_probe     = avi_probe,

     .read_header    = avi_read_header,

@@ -641,7 +641,7 @@ static int avi_write_trailer(AVFormatContext *s)

 AVOutputFormat ff_avi_muxer = {

     .name              = "avi",

-    .long_name         = NULL_IF_CONFIG_SMALL("AVI format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("AVI (Audio Video Interleaved)"),

     .mime_type         = "video/x-msvideo",

     .extensions        = "avi",

     .priv_data_size    = sizeof(AVIContext),

@@ -417,7 +417,7 @@ static int read_seek(AVFormatContext *s, int stream_index,

 AVInputFormat ff_caf_demuxer = {

     .name           = "caf",

-    .long_name      = NULL_IF_CONFIG_SMALL("Apple Core Audio Format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("Apple CAF (Core Audio Format)"),

     .priv_data_size = sizeof(CaffContext),

     .read_probe     = probe,

     .read_header    = read_header,

@@ -65,4 +65,4 @@ static int cavsvideo_probe(AVProbeData *p)

     return 0;

 }

-FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS video", cavsvideo_probe, NULL, CODEC_ID_CAVS)

+FF_DEF_RAWVIDEO_DEMUXER(cavsvideo, "raw Chinese AVS (Audio Video Standard)", cavsvideo_probe, NULL, CODEC_ID_CAVS)

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

+    .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),

     .priv_data_size = sizeof(RawDVContext),

     .read_probe     = dv_probe,

     .read_header    = dv_read_header,

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

+    .long_name         = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),

     .extensions        = "dv",

     .priv_data_size    = sizeof(DVMuxContext),

     .audio_codec       = CODEC_ID_PCM_S16LE,

@@ -875,7 +875,7 @@ static const AVClass class = {

 AVInputFormat ff_flv_demuxer = {

     .name           = "flv",

-    .long_name      = NULL_IF_CONFIG_SMALL("FLV format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("FLV (Flash Video)"),

     .priv_data_size = sizeof(FLVContext),

     .read_probe     = flv_probe,

     .read_header    = flv_read_header,

@@ -542,7 +542,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)

 AVOutputFormat ff_flv_muxer = {

     .name           = "flv",

-    .long_name      = NULL_IF_CONFIG_SMALL("FLV format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("FLV (Flash Video)"),

     .mime_type      = "video/x-flv",

     .extensions     = "flv",

     .priv_data_size = sizeof(FLVContext),

@@ -525,7 +525,7 @@ static int64_t gxf_read_timestamp(AVFormatContext *s, int stream_index,

 AVInputFormat ff_gxf_demuxer = {

     .name           = "gxf",

-    .long_name      = NULL_IF_CONFIG_SMALL("GXF format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("GXF (General eXchange Format)"),

     .priv_data_size = sizeof(struct gxf_stream_info),

     .read_probe     = gxf_probe,

     .read_header    = gxf_header,

@@ -930,7 +930,7 @@ static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pk

 AVOutputFormat ff_gxf_muxer = {

     .name              = "gxf",

-    .long_name         = NULL_IF_CONFIG_SMALL("GXF format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("GXF (General eXchange Format)"),

     .extensions        = "gxf",

     .priv_data_size    = sizeof(GXFContext),

     .audio_codec       = CODEC_ID_PCM_S16LE,

@@ -282,7 +282,7 @@ static int iff_read_packet(AVFormatContext *s,

 AVInputFormat ff_iff_demuxer = {

     .name           = "iff",

-    .long_name      = NULL_IF_CONFIG_SMALL("Interchange File Format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("IFF (Interchange File Format)"),

     .priv_data_size = sizeof(IffDemuxContext),

     .read_probe     = iff_probe,

     .read_header    = iff_read_header,

@@ -110,7 +110,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)

 AVInputFormat ff_iv8_demuxer = {

     .name           = "iv8",

-    .long_name      = NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),

+    .long_name      = NULL_IF_CONFIG_SMALL("IndigoVision 8000 video"),

     .read_probe     = probe,

     .read_header    = read_header,

     .read_packet    = read_packet,

@@ -2892,7 +2892,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti

 AVInputFormat ff_mov_demuxer = {

     .name           = "mov,mp4,m4a,3gp,3g2,mj2",

-    .long_name      = NULL_IF_CONFIG_SMALL("QuickTime/MPEG-4/Motion JPEG 2000 format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("QuickTime / MOV"),

     .priv_data_size = sizeof(MOVContext),

     .read_probe     = mov_probe,

     .read_header    = mov_read_header,

@@ -3248,7 +3248,7 @@ static int mov_write_trailer(AVFormatContext *s)

 MOV_CLASS(mov)

 AVOutputFormat ff_mov_muxer = {

     .name              = "mov",

-    .long_name         = NULL_IF_CONFIG_SMALL("MOV format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("QuickTime / MOV"),

     .extensions        = "mov",

     .priv_data_size    = sizeof(MOVMuxContext),

     .audio_codec       = CODEC_ID_AAC,

@@ -3268,7 +3268,7 @@ AVOutputFormat ff_mov_muxer = {

 MOV_CLASS(tgp)

 AVOutputFormat ff_tgp_muxer = {

     .name              = "3gp",

-    .long_name         = NULL_IF_CONFIG_SMALL("3GP format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("3GP (3GPP file format)"),

     .extensions        = "3gp",

     .priv_data_size    = sizeof(MOVMuxContext),

     .audio_codec       = CODEC_ID_AMR_NB,

@@ -3285,7 +3285,7 @@ AVOutputFormat ff_tgp_muxer = {

 MOV_CLASS(mp4)

 AVOutputFormat ff_mp4_muxer = {

     .name              = "mp4",

-    .long_name         = NULL_IF_CONFIG_SMALL("MP4 format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MP4 (MPEG-4 Part 14)"),

     .mime_type         = "application/mp4",

     .extensions        = "mp4",

     .priv_data_size    = sizeof(MOVMuxContext),

@@ -3304,7 +3304,7 @@ AVOutputFormat ff_mp4_muxer = {

 MOV_CLASS(psp)

 AVOutputFormat ff_psp_muxer = {

     .name              = "psp",

-    .long_name         = NULL_IF_CONFIG_SMALL("PSP MP4 format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("PSP MP4 (MPEG-4 Part 14)"),

     .extensions        = "mp4,psp",

     .priv_data_size    = sizeof(MOVMuxContext),

     .audio_codec       = CODEC_ID_AAC,

@@ -3322,7 +3322,7 @@ AVOutputFormat ff_psp_muxer = {

 MOV_CLASS(tg2)

 AVOutputFormat ff_tg2_muxer = {

     .name              = "3g2",

-    .long_name         = NULL_IF_CONFIG_SMALL("3GP2 format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("3GP2 (3GPP2 file format)"),

     .extensions        = "3g2",

     .priv_data_size    = sizeof(MOVMuxContext),

     .audio_codec       = CODEC_ID_AMR_NB,

@@ -3339,7 +3339,7 @@ AVOutputFormat ff_tg2_muxer = {

 MOV_CLASS(ipod)

 AVOutputFormat ff_ipod_muxer = {

     .name              = "ipod",

-    .long_name         = NULL_IF_CONFIG_SMALL("iPod H.264 MP4 format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("iPod H.264 MP4 (MPEG-4 Part 14)"),

     .mime_type         = "application/mp4",

     .extensions        = "m4v,m4a",

     .priv_data_size    = sizeof(MOVMuxContext),

@@ -205,7 +205,7 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)

 AVInputFormat ff_mp3_demuxer = {

     .name           = "mp3",

-    .long_name      = NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"),

+    .long_name      = NULL_IF_CONFIG_SMALL("MP2/3 (MPEG audio layer 2/3)"),

     .read_probe     = mp3_read_probe,

     .read_header    = mp3_read_header,

     .read_packet    = mp3_read_packet,

@@ -190,7 +190,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)

 #if CONFIG_MP2_MUXER

 AVOutputFormat ff_mp2_muxer = {

     .name              = "mp2",

-    .long_name         = NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),

     .mime_type         = "audio/x-mpeg",

     .extensions        = "mp2,m2a",

     .audio_codec       = CODEC_ID_MP2,

@@ -309,7 +309,7 @@ static int mp3_write_header(struct AVFormatContext *s)

 AVOutputFormat ff_mp3_muxer = {

     .name              = "mp3",

-    .long_name         = NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),

     .mime_type         = "audio/x-mpeg",

     .extensions        = "mp3",

     .priv_data_size    = sizeof(MP3Context),

@@ -567,7 +567,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index,

 AVInputFormat ff_mpegps_demuxer = {

     .name           = "mpeg",

-    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-PS format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-PS (MPEG-2 Program Stream)"),

     .priv_data_size = sizeof(MpegDemuxContext),

     .read_probe     = mpegps_probe,

     .read_header    = mpegps_read_header,

@@ -1144,7 +1144,7 @@ static const AVClass flavor ## _class = {\

 MPEGENC_CLASS(mpeg)

 AVOutputFormat ff_mpeg1system_muxer = {

     .name              = "mpeg",

-    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-1 System format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream"),

     .mime_type         = "video/mpeg",

     .extensions        = "mpg,mpeg",

     .priv_data_size    = sizeof(MpegMuxContext),

@@ -1160,7 +1160,7 @@ AVOutputFormat ff_mpeg1system_muxer = {

 MPEGENC_CLASS(vcd)

 AVOutputFormat ff_mpeg1vcd_muxer = {

     .name              = "vcd",

-    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-1 System format (VCD)"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-1 Systems / MPEG program stream (VCD)"),

     .mime_type         = "video/mpeg",

     .priv_data_size    = sizeof(MpegMuxContext),

     .audio_codec       = CODEC_ID_MP2,

@@ -1193,7 +1193,7 @@ AVOutputFormat ff_mpeg2vob_muxer = {

 MPEGENC_CLASS(svcd)

 AVOutputFormat ff_mpeg2svcd_muxer = {

     .name              = "svcd",

-    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-2 PS format (VOB)"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-2 PS (SVCD)"),

     .mime_type         = "video/mpeg",

     .extensions        = "vob",

     .priv_data_size    = sizeof(MpegMuxContext),

@@ -2169,7 +2169,7 @@ void ff_mpegts_parse_close(MpegTSContext *ts)

 AVInputFormat ff_mpegts_demuxer = {

     .name           = "mpegts",

-    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),

     .priv_data_size = sizeof(MpegTSContext),

     .read_probe     = mpegts_probe,

     .read_header    = mpegts_read_header,

@@ -2182,7 +2182,7 @@ AVInputFormat ff_mpegts_demuxer = {

 AVInputFormat ff_mpegtsraw_demuxer = {

     .name           = "mpegtsraw",

-    .long_name      = NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("raw MPEG-TS (MPEG-2 Transport Stream)"),

     .priv_data_size = sizeof(MpegTSContext),

     .read_header    = mpegts_read_header,

     .read_packet    = mpegts_raw_read_packet,

@@ -1162,7 +1162,7 @@ static int mpegts_write_end(AVFormatContext *s)

 AVOutputFormat ff_mpegts_muxer = {

     .name              = "mpegts",

-    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),

     .mime_type         = "video/x-mpegts",

     .extensions        = "ts,m2t",

     .priv_data_size    = sizeof(MpegTSWrite),

@@ -2246,7 +2246,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti

 AVInputFormat ff_mxf_demuxer = {

     .name           = "mxf",

-    .long_name      = NULL_IF_CONFIG_SMALL("Material eXchange Format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"),

     .priv_data_size = sizeof(MXFContext),

     .read_probe     = mxf_probe,

     .read_header    = mxf_read_header,

@@ -1890,7 +1890,7 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int

 AVOutputFormat ff_mxf_muxer = {

     .name              = "mxf",

-    .long_name         = NULL_IF_CONFIG_SMALL("Material eXchange Format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"),

     .mime_type         = "application/mxf",

     .extensions        = "mxf",

     .priv_data_size    = sizeof(MXFContext),

@@ -1905,7 +1905,7 @@ AVOutputFormat ff_mxf_muxer = {

 AVOutputFormat ff_mxf_d10_muxer = {

     .name              = "mxf_d10",

-    .long_name         = NULL_IF_CONFIG_SMALL("Material eXchange Format, D-10 Mapping"),

+    .long_name         = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format) D-10 Mapping"),

     .mime_type         = "application/mxf",

     .priv_data_size    = sizeof(MXFContext),

     .audio_codec       = CODEC_ID_PCM_S16LE,

@@ -60,7 +60,7 @@ AVOutputFormat ff_adx_muxer = {

 #if CONFIG_CAVSVIDEO_MUXER

 AVOutputFormat ff_cavsvideo_muxer = {

     .name              = "cavsvideo",

-    .long_name         = NULL_IF_CONFIG_SMALL("raw Chinese AVS video"),

+    .long_name         = NULL_IF_CONFIG_SMALL("raw Chinese AVS (Audio Video Standard) video"),

     .extensions        = "cavs",

     .audio_codec       = CODEC_ID_NONE,

     .video_codec       = CODEC_ID_CAVS,

@@ -264,7 +264,7 @@ static const AVClass seg_class = {

 AVOutputFormat ff_segment_muxer = {

     .name           = "segment",

-    .long_name      = NULL_IF_CONFIG_SMALL("segment muxer"),

+    .long_name      = NULL_IF_CONFIG_SMALL("segment"),

     .priv_data_size = sizeof(SegmentContext),

     .flags          = AVFMT_GLOBALHEADER | AVFMT_NOFILE,

     .write_header   = seg_write_header,

@@ -211,7 +211,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)

 AVInputFormat ff_swf_demuxer = {

     .name           = "swf",

-    .long_name      = NULL_IF_CONFIG_SMALL("Flash format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash)"),

     .priv_data_size = sizeof(SWFContext),

     .read_probe     = swf_probe,

     .read_header    = swf_read_header,

@@ -504,7 +504,7 @@ static int swf_write_trailer(AVFormatContext *s)

 #if CONFIG_SWF_MUXER

 AVOutputFormat ff_swf_muxer = {

     .name              = "swf",

-    .long_name         = NULL_IF_CONFIG_SMALL("Flash format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash)"),

     .mime_type         = "application/x-shockwave-flash",

     .extensions        = "swf",

     .priv_data_size    = sizeof(SWFContext),

@@ -519,7 +519,7 @@ AVOutputFormat ff_swf_muxer = {

 #if CONFIG_AVM2_MUXER

 AVOutputFormat ff_avm2_muxer = {

     .name              = "avm2",

-    .long_name         = NULL_IF_CONFIG_SMALL("Flash 9 (AVM2) format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("SWF (ShockWave Flash) (AVM2)"),

     .mime_type         = "application/x-shockwave-flash",

     .priv_data_size    = sizeof(SWFContext),

     .audio_codec       = CODEC_ID_MP3,

@@ -160,7 +160,7 @@ static int tta_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp

 AVInputFormat ff_tta_demuxer = {

     .name           = "tta",

-    .long_name      = NULL_IF_CONFIG_SMALL("True Audio"),

+    .long_name      = NULL_IF_CONFIG_SMALL("TTA (True Audio)"),

     .priv_data_size = sizeof(TTAContext),

     .read_probe     = tta_probe,

     .read_header    = tta_read_header,

@@ -207,7 +207,7 @@ static const AVClass wav_muxer_class = {

 AVOutputFormat ff_wav_muxer = {

     .name              = "wav",

-    .long_name         = NULL_IF_CONFIG_SMALL("WAV format"),

+    .long_name         = NULL_IF_CONFIG_SMALL("WAV / WAVE (Waveform Audio)"),

     .mime_type         = "audio/x-wav",

     .extensions        = "wav",

     .priv_data_size    = sizeof(WAVContext),

@@ -588,7 +588,7 @@ static int wav_read_seek(AVFormatContext *s,

 AVInputFormat ff_wav_demuxer = {

     .name           = "wav",

-    .long_name      = NULL_IF_CONFIG_SMALL("WAV format"),

+    .long_name      = NULL_IF_CONFIG_SMALL("WAV / WAVE (Waveform Audio)"),

     .priv_data_size = sizeof(WAVContext),

     .read_probe     = wav_probe,

     .read_header    = wav_read_header,