Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'

* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
  ogg: Use separate classes for the aliases

Conflicts:
	libavformat/oggenc.c

See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/oggenc.c
index 9022eb1,489f010..4a54126
--- 1/libavformat/oggenc.c
--- 2/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@@ -86,6 -84,14 +86,14 @@@ static const AVOption options[] = 
      { NULL },
  };
  
 -#define OGG_CLASS(flavor)\
++#define OGG_CLASS(flavor, name)\
+ static const AVClass flavor ## _muxer_class = {\
 -    .class_name = #flavor " muxer",\
++    .class_name = #name " muxer",\
+     .item_name  = av_default_item_name,\
+     .option     = options,\
+     .version    = LIBAVUTIL_VERSION_INT,\
+ };
+ 
  static void ogg_update_checksum(AVFormatContext *s, AVIOContext *pb, int64_t crc_offset)
  {
      int64_t pos = avio_tell(pb);
@@@ -638,13 -628,7 +646,7 @@@ static int ogg_write_trailer(AVFormatCo
  }
  
  #if CONFIG_OGG_MUXER
- static const AVClass ogg_muxer_class = {
-     .class_name = "Ogg muxer",
-     .item_name  = av_default_item_name,
-     .option     = options,
-     .version    = LIBAVUTIL_VERSION_INT,
- };
- 
 -OGG_CLASS(ogg)
++OGG_CLASS(ogg, Ogg)
  AVOutputFormat ff_ogg_muxer = {
      .name              = "ogg",
      .long_name         = NULL_IF_CONFIG_SMALL("Ogg"),
@@@ -670,13 -647,7 +672,7 @@@
  #endif
  
  #if CONFIG_OGA_MUXER
- static const AVClass oga_muxer_class = {
-     .class_name = "Ogg audio muxer",
-     .item_name  = av_default_item_name,
-     .option     = options,
-     .version    = LIBAVUTIL_VERSION_INT,
- };
- 
 -OGG_CLASS(oga)
++OGG_CLASS(oga, Ogg audio)
  AVOutputFormat ff_oga_muxer = {
      .name              = "oga",
      .long_name         = NULL_IF_CONFIG_SMALL("Ogg Audio"),
@@@ -694,13 -665,7 +690,7 @@@
  #endif
  
  #if CONFIG_SPX_MUXER
- static const AVClass spx_muxer_class = {
-     .class_name = "Ogg Speex muxer",
-     .item_name  = av_default_item_name,
-     .option     = options,
-     .version    = LIBAVUTIL_VERSION_INT,
- };
- 
 -OGG_CLASS(spx)
++OGG_CLASS(spx, Ogg Speex)
  AVOutputFormat ff_spx_muxer = {
      .name              = "spx",
      .long_name         = NULL_IF_CONFIG_SMALL("Ogg Speex"),
@@@ -717,13 -682,7 +707,7 @@@
  #endif
  
  #if CONFIG_OPUS_MUXER
- static const AVClass opus_muxer_class = {
-     .class_name = "Ogg Opus muxer",
-     .item_name  = av_default_item_name,
-     .option     = options,
-     .version    = LIBAVUTIL_VERSION_INT,
- };
- 
 -OGG_CLASS(opus)
++OGG_CLASS(opus, Ogg Opus)
  AVOutputFormat ff_opus_muxer = {
      .name              = "opus",
      .long_name         = NULL_IF_CONFIG_SMALL("Ogg Opus"),