---
 libavcodec/ac3dec.c           |    4 ++--
 libavcodec/apedec.c           |    2 +-
 libavcodec/g722dec.c          |    2 +-
 libavcodec/g723_1.c           |    2 +-
 libavcodec/libmp3lame.c       |    2 +-
 libavcodec/libvpxenc.c        |    2 +-
 libavcodec/mjpegdec.c         |    2 +-
 libavcodec/mpeg12enc.c        |    2 +-
 libavcodec/mpeg4videoenc.c    |    2 +-
 libavcodec/mpegvideo.h        |    2 +-
 libavcodec/mpegvideo_enc.c    |    4 ++--
 libavcodec/proresenc.c        |    2 +-
 libavcodec/snowenc.c          |    2 +-
 libavcodec/tiffenc.c          |    2 +-
 libavdevice/alsa-audio-dec.c  |    2 +-
 libavdevice/dv1394.c          |    2 +-
 libavdevice/fbdev.c           |    2 +-
 libavdevice/jack_audio.c      |    2 +-
 libavdevice/libcdio.c         |    2 +-
 libavdevice/libdc1394.c       |    2 +-
 libavdevice/oss_audio.c       |    2 +-
 libavdevice/pulse.c           |    2 +-
 libavdevice/sndio_dec.c       |    2 +-
 libavdevice/v4l2.c            |    2 +-
 libavdevice/vfwcap.c          |    2 +-
 libavdevice/x11grab.c         |    2 +-
 libavfilter/af_aformat.c      |    2 +-
 libavfilter/af_amix.c         |    2 +-
 libavfilter/af_asyncts.c      |    2 +-
 libavfilter/af_channelmap.c   |    2 +-
 libavfilter/af_channelsplit.c |    2 +-
 libavfilter/af_join.c         |    2 +-
 libavfilter/buffersrc.c       |    2 +-
 libavfilter/vf_fps.c          |    2 +-
 libavformat/asfdec.c          |    2 +-
 libavformat/cdxl.c            |    2 +-
 libavformat/gif.c             |    2 +-
 libavformat/gsmdec.c          |    2 +-
 libavformat/img2dec.c         |    4 ++--
 libavformat/img2enc.c         |    2 +-
 libavformat/latmenc.c         |    2 +-
 libavformat/librtmp.c         |    2 +-
 libavformat/movenc.c          |    2 +-
 libavformat/mp3enc.c          |    2 +-
 libavformat/mpegenc.c         |    2 +-
 libavformat/mpegts.c          |    2 +-
 libavformat/mpegtsenc.c       |    2 +-
 libavformat/oggenc.c          |    2 +-
 libavformat/pcmdec.c          |    2 +-
 libavformat/rawdec.h          |    2 +-
 libavformat/rawvideodec.c     |    2 +-
 libavformat/rtpenc.c          |    2 +-
 libavformat/rtsp.c            |    4 ++--
 libavformat/rtspdec.c         |    2 +-
 libavformat/rtspenc.c         |    2 +-
 libavformat/segment.c         |    2 +-
 libavformat/tty.c             |    2 +-
 libavformat/wav.c             |    2 +-
 58 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 3056403..6335599 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1451,7 +1451,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass ac3_decoder_class = {
-    .class_name = "AC3 decoder",
+    .class_name = "AC3",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
@@ -1475,7 +1475,7 @@ AVCodec ff_ac3_decoder = {
 
 #if CONFIG_EAC3_DECODER
 static const AVClass eac3_decoder_class = {
-    .class_name = "E-AC3 decoder",
+    .class_name = "E-AC3",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index b07f3a0..09f2208 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -978,7 +978,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass ape_decoder_class = {
-    .class_name = "APE decoder",
+    .class_name = "APE",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c
index 72bb0ef..b7e482c 100644
--- a/libavcodec/g722dec.c
+++ b/libavcodec/g722dec.c
@@ -47,7 +47,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass g722_decoder_class = {
-    .class_name = "g722 decoder",
+    .class_name = "g722",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index df14a46..8e732dc 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1.c
@@ -1156,7 +1156,7 @@ static const AVOption options[] = {
 
 
 static const AVClass g723_1dec_class = {
-    .class_name = "G.723.1 decoder",
+    .class_name = "G.723.1",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index a747f65..4c80110 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -275,7 +275,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass libmp3lame_class = {
-    .class_name = "libmp3lame encoder",
+    .class_name = "libmp3lame",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 7986f6a..2452f62 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -551,7 +551,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass class = {
-    .class_name = "libvpx encoder",
+    .class_name = "libvpx",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 7864d38..b24d6cb 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1636,7 +1636,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass mjpegdec_class = {
-    .class_name = "MJPEG decoder",
+    .class_name = "MJPEG",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index b0175b1..1b55d33 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -941,7 +941,7 @@ static const AVOption mpeg2_options[] = {
 
 #define mpeg12_class(x)\
 static const AVClass mpeg## x ##_class = {\
-    .class_name   = "mpeg" #x "video encoder",\
+    .class_name   = "mpeg" #x "video",\
     .item_name    = av_default_item_name,\
     .option       = mpeg## x ##_options,\
     .version      = LIBAVUTIL_VERSION_INT,\
diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index 95bb3a5..e27cca5 100644
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -1325,7 +1325,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass mpeg4enc_class = {
-    .class_name = "MPEG4 encoder",
+    .class_name = "MPEG4",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index f5b20e6..4817068 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -733,7 +733,7 @@ extern const AVOption ff_mpv_generic_options[];
 
 #define FF_MPV_GENERIC_CLASS(name) \
 static const AVClass name ## _class = {\
-    .class_name = #name " encoder",\
+    .class_name = #name,\
     .item_name  = av_default_item_name,\
     .option     = ff_mpv_generic_options,\
     .version    = LIBAVUTIL_VERSION_INT,\
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index f88df92..3184364 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -4120,7 +4120,7 @@ static const AVOption h263_options[] = {
 };
 
 static const AVClass h263_class = {
-    .class_name = "H.263 encoder",
+    .class_name = "H.263",
     .item_name  = av_default_item_name,
     .option     = h263_options,
     .version    = LIBAVUTIL_VERSION_INT,
@@ -4148,7 +4148,7 @@ static const AVOption h263p_options[] = {
     { NULL },
 };
 static const AVClass h263p_class = {
-    .class_name = "H.263p encoder",
+    .class_name = "H.263p",
     .item_name  = av_default_item_name,
     .option     = h263p_options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index f821533..36ba0a4 100644
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -1012,7 +1012,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass proresenc_class = {
-    .class_name = "ProRes encoder",
+    .class_name = "ProRes",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index ebfeff6..31cea2a 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1919,7 +1919,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass snowenc_class = {
-    .class_name = "snow encoder",
+    .class_name = "snow",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 7504216..7f41799 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -460,7 +460,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass tiffenc_class = {
-    .class_name = "TIFF encoder",
+    .class_name = "TIFF",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c
index b6a7ac2..f1eff4e 100644
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa-audio-dec.c
@@ -157,7 +157,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass alsa_demuxer_class = {
-    .class_name     = "ALSA demuxer",
+    .class_name     = "ALSA",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 2bb65b6..4dac9b5 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -219,7 +219,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass dv1394_class = {
-    .class_name = "DV1394 indev",
+    .class_name = "DV1394",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c
index d789d41..400432c 100644
--- a/libavdevice/fbdev.c
+++ b/libavdevice/fbdev.c
@@ -250,7 +250,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass fbdev_class = {
-    .class_name = "fbdev indev",
+    .class_name = "fbdev",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c
index 85f9f09..bcc8891 100644
--- a/libavdevice/jack_audio.c
+++ b/libavdevice/jack_audio.c
@@ -326,7 +326,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass jack_indev_class = {
-    .class_name     = "JACK indev",
+    .class_name     = "JACK",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index ae2b7d4..6c3d5cc 100644
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -169,7 +169,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass libcdio_class = {
-    .class_name = "libcdio indev",
+    .class_name = "libcdio",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index 934e128..4698f8b 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -110,7 +110,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass libdc1394_class = {
-    .class_name = "libdc1394 indev",
+    .class_name = "libdc1394",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index fb6e383..8490a76 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -287,7 +287,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass oss_demuxer_class = {
-    .class_name     = "OSS demuxer",
+    .class_name     = "OSS",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c
index da6ee72..fe3ac5f 100644
--- a/libavdevice/pulse.c
+++ b/libavdevice/pulse.c
@@ -172,7 +172,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass pulse_demuxer_class = {
-    .class_name     = "Pulse demuxer",
+    .class_name     = "Pulse",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
index 840dd09..a3c418c 100644
--- a/libavdevice/sndio_dec.c
+++ b/libavdevice/sndio_dec.c
@@ -99,7 +99,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass sndio_demuxer_class = {
-    .class_name     = "sndio indev",
+    .class_name     = "sndio",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 2154b63..a684c8f 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -839,7 +839,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass v4l2_class = {
-    .class_name = "V4L2 indev",
+    .class_name = "V4L2",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index 44cb813..4ee27ba 100644
--- a/libavdevice/vfwcap.c
+++ b/libavdevice/vfwcap.c
@@ -464,7 +464,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass vfw_class = {
-    .class_name = "VFW indev",
+    .class_name = "VFW",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 06cec9d..b0846c4 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -596,7 +596,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass x11_class = {
-    .class_name = "X11grab indev",
+    .class_name = "X11grab",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 6c46f4b..e8f9a20 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -54,7 +54,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass aformat_class = {
-    .class_name = "aformat filter",
+    .class_name = "aformat",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index d79a626..03528be 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -188,7 +188,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass amix_class = {
-    .class_name = "amix filter",
+    .class_name = "amix",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
index 4052fbd..32b60a3 100644
--- a/libavfilter/af_asyncts.c
+++ b/libavfilter/af_asyncts.c
@@ -53,7 +53,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass async_class = {
-    .class_name = "asyncts filter",
+    .class_name = "asyncts",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index b5cd96a..1ff9b5a 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -76,7 +76,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass channelmap_class = {
-    .class_name = "channel map filter",
+    .class_name = "channel map",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
index 32b85d8..ea58171 100644
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@@ -46,7 +46,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass channelsplit_class = {
-    .class_name = "channelsplit filter",
+    .class_name = "channelsplit",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index f25ec92..105c35e 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -86,7 +86,7 @@ static const AVOption join_options[] = {
 };
 
 static const AVClass join_class = {
-    .class_name = "join filter",
+    .class_name = "join",
     .item_name  = av_default_item_name,
     .option     = join_options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 33cb63b..51ff22c 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -199,7 +199,7 @@ static const AVOption audio_options[] = {
 };
 
 static const AVClass abuffer_class = {
-    .class_name = "abuffer source",
+    .class_name = "abuffer",
     .item_name  = av_default_item_name,
     .option     = audio_options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index d95fef5..19bb0db 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -57,7 +57,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass class = {
-    .class_name = "FPS filter",
+    .class_name = "FPS",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index a0bbdb4..c1ce7a6 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -85,7 +85,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass asf_class = {
-    .class_name = "asf demuxer",
+    .class_name = "asf",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c
index 809507f..90c9d06 100644
--- a/libavformat/cdxl.c
+++ b/libavformat/cdxl.c
@@ -163,7 +163,7 @@ static const AVOption cdxl_options[] = {
 };
 
 static const AVClass cdxl_demuxer_class = {
-    .class_name = "CDXL demuxer",
+    .class_name = "CDXL",
     .item_name  = av_default_item_name,
     .option     = cdxl_options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/gif.c b/libavformat/gif.c
index 79350a2..aa22cf6 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -360,7 +360,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass gif_muxer_class = {
-    .class_name = "GIF muxer",
+    .class_name = "GIF",
     .item_name  = av_default_item_name,
     .version    = LIBAVUTIL_VERSION_INT,
     .option     = options,
diff --git a/libavformat/gsmdec.c b/libavformat/gsmdec.c
index 3525a03..7b99b30 100644
--- a/libavformat/gsmdec.c
+++ b/libavformat/gsmdec.c
@@ -80,7 +80,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass class = {
-    .class_name = "gsm demuxer",
+    .class_name = "gsm",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 8f30cd5..e86d5fc 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -291,7 +291,7 @@ static const AVOption options[] = {
 
 #if CONFIG_IMAGE2_DEMUXER
 static const AVClass img2_class = {
-    .class_name = "image2 demuxer",
+    .class_name = "image2",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
@@ -309,7 +309,7 @@ AVInputFormat ff_image2_demuxer = {
 #endif
 #if CONFIG_IMAGE2PIPE_DEMUXER
 static const AVClass img2pipe_class = {
-    .class_name = "image2pipe demuxer",
+    .class_name = "image2pipe",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 0f34857..7633fe9 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -134,7 +134,7 @@ static const AVOption muxoptions[] = {
 
 #if CONFIG_IMAGE2_MUXER
 static const AVClass img2mux_class = {
-    .class_name = "image2 muxer",
+    .class_name = "image2",
     .item_name  = av_default_item_name,
     .option     = muxoptions,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index 423710d..fcbe561 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -42,7 +42,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass latm_muxer_class = {
-    .class_name = "LATM/LOAS muxer",
+    .class_name = "LATM/LOAS",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index 7133bd6..6407fcf 100644
--- a/libavformat/librtmp.c
+++ b/libavformat/librtmp.c
@@ -201,7 +201,7 @@ static const AVOption options[] = {
 
 #define RTMP_CLASS(flavor)\
 static const AVClass lib ## flavor ## _class = {\
-    .class_name = "lib" #flavor " protocol",\
+    .class_name = "lib" #flavor,\
     .item_name  = av_default_item_name,\
     .option     = options,\
     .version    = LIBAVUTIL_VERSION_INT,\
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 23c852e..6e6764b 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -64,7 +64,7 @@ static const AVOption options[] = {
 
 #define MOV_CLASS(flavor)\
 static const AVClass flavor ## _muxer_class = {\
-    .class_name = #flavor " muxer",\
+    .class_name = #flavor,\
     .item_name  = av_default_item_name,\
     .option     = options,\
     .version    = LIBAVUTIL_VERSION_INT,\
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index af15d6a..9620a62 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -211,7 +211,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass mp3_muxer_class = {
-    .class_name     = "MP3 muxer",
+    .class_name     = "MP3",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 6144d6b..03a3b55 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1134,7 +1134,7 @@ static const AVOption options[] = {
 
 #define MPEGENC_CLASS(flavor)\
 static const AVClass flavor ## _class = {\
-    .class_name = #flavor " muxer",\
+    .class_name = #flavor,\
     .item_name  = av_default_item_name,\
     .version    = LIBAVUTIL_VERSION_INT,\
     .option     = options,\
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 9bd1867..eb4cdf5 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -134,7 +134,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass mpegtsraw_class = {
-    .class_name = "mpegtsraw demuxer",
+    .class_name = "mpegtsraw",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 9470c21..1c42cc5 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -116,7 +116,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass mpegts_muxer_class = {
-    .class_name     = "MPEGTS muxer",
+    .class_name     = "MPEGTS",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 6ccbd58..9d4c882 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -79,7 +79,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass ogg_muxer_class = {
-    .class_name = "Ogg muxer",
+    .class_name = "Ogg",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c
index fce0418..aec9d5a 100644
--- a/libavformat/pcmdec.c
+++ b/libavformat/pcmdec.c
@@ -56,7 +56,7 @@ static const AVOption pcm_options[] = {
 
 #define PCMDEF(name_, long_name_, ext, codec)               \
 static const AVClass name_ ## _demuxer_class = {            \
-    .class_name = #name_ " demuxer",                        \
+    .class_name = #name_,                                   \
     .item_name  = av_default_item_name,                     \
     .option     = pcm_options,                              \
     .version    = LIBAVUTIL_VERSION_INT,                    \
diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h
index 4cce2cf..af3695b 100644
--- a/libavformat/rawdec.h
+++ b/libavformat/rawdec.h
@@ -51,7 +51,7 @@ int ff_raw_video_read_header(AVFormatContext *s);
 
 #define FF_RAWVIDEO_DEMUXER_CLASS(name)\
 static const AVClass name ## _demuxer_class = {\
-    .class_name = #name " demuxer",\
+    .class_name = #name,\
     .item_name  = av_default_item_name,\
     .option     = ff_rawvideo_options,\
     .version    = LIBAVUTIL_VERSION_INT,\
diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c
index 5c1593e..3a0043f 100644
--- a/libavformat/rawvideodec.c
+++ b/libavformat/rawvideodec.c
@@ -54,7 +54,7 @@ static const AVOption rawvideo_options[] = {
 };
 
 static const AVClass rawvideo_demuxer_class = {
-    .class_name = "rawvideo demuxer",
+    .class_name = "rawvideo",
     .item_name  = av_default_item_name,
     .option     = rawvideo_options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index d173cf3..b179a73 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -38,7 +38,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass rtp_muxer_class = {
-    .class_name = "RTP muxer",
+    .class_name = "RTP",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index eb04bbc..08f9ccd 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1955,7 +1955,7 @@ static int sdp_read_close(AVFormatContext *s)
 }
 
 static const AVClass sdp_demuxer_class = {
-    .class_name     = "SDP demuxer",
+    .class_name     = "SDP",
     .item_name      = av_default_item_name,
     .option         = sdp_options,
     .version        = LIBAVUTIL_VERSION_INT,
@@ -2072,7 +2072,7 @@ fail:
 }
 
 static const AVClass rtp_demuxer_class = {
-    .class_name     = "RTP demuxer",
+    .class_name     = "RTP",
     .item_name      = av_default_item_name,
     .option         = rtp_options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 3fd5e71..79dc900 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -910,7 +910,7 @@ static int rtsp_read_seek(AVFormatContext *s, int 
stream_index,
 }
 
 static const AVClass rtsp_demuxer_class = {
-    .class_name     = "RTSP demuxer",
+    .class_name     = "RTSP",
     .item_name      = av_default_item_name,
     .option         = ff_rtsp_options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c
index 5436925..75e3997 100644
--- a/libavformat/rtspenc.c
+++ b/libavformat/rtspenc.c
@@ -36,7 +36,7 @@
 #define SDP_MAX_SIZE 16384
 
 static const AVClass rtsp_muxer_class = {
-    .class_name = "RTSP muxer",
+    .class_name = "RTSP",
     .item_name  = av_default_item_name,
     .option     = ff_rtsp_options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/segment.c b/libavformat/segment.c
index 3d55e4c..bcab0e2 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
@@ -255,7 +255,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass seg_class = {
-    .class_name = "segment muxer",
+    .class_name = "segment",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/tty.c b/libavformat/tty.c
index 84f9937..7430209 100644
--- a/libavformat/tty.c
+++ b/libavformat/tty.c
@@ -149,7 +149,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass tty_demuxer_class = {
-    .class_name     = "TTY demuxer",
+    .class_name     = "TTY",
     .item_name      = av_default_item_name,
     .option         = options,
     .version        = LIBAVUTIL_VERSION_INT,
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 042bcd8..4aaeb88 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -199,7 +199,7 @@ static const AVOption options[] = {
 };
 
 static const AVClass wav_muxer_class = {
-    .class_name = "WAV muxer",
+    .class_name = "WAV",
     .item_name  = av_default_item_name,
     .option     = options,
     .version    = LIBAVUTIL_VERSION_INT,
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to