---
libavcodec/aacenc.c | 2 +-
libavcodec/amrnbdec.c | 2 +-
libavcodec/amrwbdec.c | 2 +-
libavcodec/bmpenc.c | 2 +-
libavcodec/cavsdec.c | 2 +-
libavcodec/cook.c | 2 +-
libavcodec/libopenjpegdec.c | 2 +-
libavcodec/libxavs.c | 2 +-
libavformat/asfdec.c | 2 +-
libavformat/asfenc.c | 4 ++--
libavformat/au.c | 4 ++--
libavformat/avidec.c | 2 +-
libavformat/avienc.c | 2 +-
libavformat/flvdec.c | 2 +-
libavformat/flvenc.c | 2 +-
libavformat/gxf.c | 2 +-
libavformat/gxfenc.c | 2 +-
libavformat/iff.c | 2 +-
libavformat/iv8.c | 2 +-
libavformat/mov.c | 2 +-
libavformat/movenc.c | 12 ++++++------
libavformat/mp3dec.c | 2 +-
libavformat/mp3enc.c | 4 ++--
libavformat/mpeg.c | 2 +-
libavformat/mpegenc.c | 6 +++---
libavformat/mpegts.c | 4 ++--
libavformat/mpegtsenc.c | 2 +-
libavformat/mxfdec.c | 2 +-
libavformat/mxfenc.c | 4 ++--
libavformat/rawenc.c | 2 +-
libavformat/swfdec.c | 2 +-
libavformat/swfenc.c | 4 ++--
libavformat/wav.c | 4 ++--
33 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 0186011..f7360a1 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -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,
};
diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c
index ab721ea..27f5eac 100644
--- a/libavcodec/amrnbdec.c
+++ b/libavcodec/amrnbdec.c
@@ -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 },
};
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index ed60529..c1b577a 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -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 },
};
diff --git a/libavcodec/bmpenc.c b/libavcodec/bmpenc.c
index 6d24cac..1134d83 100644
--- a/libavcodec/bmpenc.c
+++ b/libavcodec/bmpenc.c
@@ -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("Bitmap image"),
};
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 9f91d0b..87a8770 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -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)
video (AVS1-P2, JiZhun profile)"),
};
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index c8d7d77..ae4b63a 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -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"),
};
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 6696ee5..5ebb944 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -257,7 +257,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),
};
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c
index 9e45a37..458a6cc 100644
--- a/libavcodec/libxavs.c
+++ b/libavcodec/libxavs.c
@@ -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) video"),
.priv_class = &class,
.defaults = xavs_defaults,
};
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 91b0992..fb3ace5 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -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 Systems Format /
Advanced Streaming Format / Active Streaming Format)"),
.priv_data_size = sizeof(ASFContext),
.read_probe = asf_probe,
.read_header = asf_read_header,
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c
index a8814eb..00c22a0 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -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 Systems Format /
Advanced Streaming Format / 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 Systems Format /
Advanced Streaming Format / Active Streaming Format)"),
.mime_type = "video/x-ms-asf",
.extensions = "asf,wmv,wma",
.priv_data_size = sizeof(ASFContext),
diff --git a/libavformat/au.c b/libavformat/au.c
index bb9d5d5..e88486b 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -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,
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 38f84f9..60783ff 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -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,
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index e611dca..38c9d9d 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -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),
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 12c2504..99351be 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -876,7 +876,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("Flash Video (FLV)"),
.priv_data_size = sizeof(FLVContext),
.read_probe = flv_probe,
.read_header = flv_read_header,
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index ce1a4e4..a424e8d 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -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("Flash Video (FLV)"),
.mime_type = "video/x-flv",
.extensions = "flv",
.priv_data_size = sizeof(FLVContext),
diff --git a/libavformat/gxf.c b/libavformat/gxf.c
index fcf6c93..f47b6de 100644
--- a/libavformat/gxf.c
+++ b/libavformat/gxf.c
@@ -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,
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
index c11b77b..7d5ccf8 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -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,
diff --git a/libavformat/iff.c b/libavformat/iff.c
index cde420e..5969015 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -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,
diff --git a/libavformat/iv8.c b/libavformat/iv8.c
index 4402855..99732fc 100644
--- a/libavformat/iv8.c
+++ b/libavformat/iv8.c
@@ -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,
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 59d7b1a..db10069 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2890,7 +2890,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,
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index a97045c..18f56d4 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -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),
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 3987520..75fed92 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -209,7 +209,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,
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 5365e3d..af15d6a 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -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),
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index ebaf3db..a0b8f59 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -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,
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index ecb7cda..7f08f3e 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -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),
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 5b44c0e..9bd1867 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -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,
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 7456931..9470c21 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -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),
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index a68b1a4..0a31559 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -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,
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 597a4f7..37c5432 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -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,
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index e46fe64..927221c 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -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,
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 71346de..e6036c6 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -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,
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index fb0fdc5..f437f5c 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -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,
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 1bfe6d5..32ea4d9 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -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,
--
1.7.1
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
