Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 19:14:43 +0000 (21:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 19:41:00 +0000 (21:41 +0200)
* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
  ogg: Provide aliases for Speex, Opus and audio-only ogg

Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h

See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavformat/allformats.c
libavformat/oggenc.c
libavformat/version.h

diff --cc configure
Simple merge
@@@ -274,16 -228,12 +274,16 @@@ void av_register_all(void
      REGISTER_DEMUXER (SMUSH,            smush);
      REGISTER_DEMUXER (SOL,              sol);
      REGISTER_MUXDEMUX(SOX,              sox);
+     REGISTER_MUXER   (SPX,              spx);
      REGISTER_MUXDEMUX(SPDIF,            spdif);
-     REGISTER_MUXER   (SPEEX,            speex);
      REGISTER_MUXDEMUX(SRT,              srt);
      REGISTER_DEMUXER (STR,              str);
 +    REGISTER_DEMUXER (SUBVIEWER1,       subviewer1);
 +    REGISTER_DEMUXER (SUBVIEWER,        subviewer);
      REGISTER_MUXDEMUX(SWF,              swf);
      REGISTER_DEMUXER (TAK,              tak);
 +    REGISTER_MUXER   (TEE,              tee);
 +    REGISTER_DEMUXER (TEDCAPTIONS,      tedcaptions);
      REGISTER_MUXER   (TG2,              tg2);
      REGISTER_MUXER   (TGP,              tgp);
      REGISTER_DEMUXER (THP,              thp);
@@@ -649,14 -632,7 +649,14 @@@ AVOutputFormat ff_ogg_muxer = 
      .name              = "ogg",
      .long_name         = NULL_IF_CONFIG_SMALL("Ogg"),
      .mime_type         = "application/ogg",
 -    .extensions        = "ogg,ogv",
 +    .extensions        = "ogg,ogv"
- #if !CONFIG_SPEEX_MUXER
++#if !CONFIG_SPX_MUXER
 +                         ",spx"
 +#endif
 +#if !CONFIG_OPUS_MUXER
 +                         ",opus"
 +#endif
 +                         ,
      .priv_data_size    = sizeof(OGGContext),
      .audio_codec       = CONFIG_LIBVORBIS_ENCODER ?
                           AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC,
  #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,
 +};
 +
  AVOutputFormat ff_oga_muxer = {
      .name              = "oga",
-     .long_name         = NULL_IF_CONFIG_SMALL("Ogg audio"),
+     .long_name         = NULL_IF_CONFIG_SMALL("Ogg Audio"),
      .mime_type         = "audio/ogg",
      .extensions        = "oga",
      .priv_data_size    = sizeof(OGGContext),
      .write_header      = ogg_write_header,
      .write_packet      = ogg_write_packet,
      .write_trailer     = ogg_write_trailer,
-     .flags             = AVFMT_TS_NEGATIVE,
+     .flags             = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
 -    .priv_class        = &ogg_muxer_class,
 +    .priv_class        = &oga_muxer_class,
  };
  #endif
  
- #if CONFIG_SPEEX_MUXER
- static const AVClass speex_muxer_class = {
-     .class_name = "Speex muxer",
+ #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,
 +};
 +
- AVOutputFormat ff_speex_muxer = {
-     .name              = "speex",
-     .long_name         = NULL_IF_CONFIG_SMALL("Speex"),
+ AVOutputFormat ff_spx_muxer = {
+     .name              = "spx",
+     .long_name         = NULL_IF_CONFIG_SMALL("Ogg Speex"),
      .mime_type         = "audio/ogg",
      .extensions        = "spx",
      .priv_data_size    = sizeof(OGGContext),
      .write_header      = ogg_write_header,
      .write_packet      = ogg_write_packet,
      .write_trailer     = ogg_write_trailer,
-     .flags             = AVFMT_TS_NEGATIVE,
-     .priv_class        = &speex_muxer_class,
+     .flags             = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
 -    .priv_class        = &ogg_muxer_class,
++    .priv_class        = &spx_muxer_class,
  };
  #endif
  
  #if CONFIG_OPUS_MUXER
-     .class_name = "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,
 +};
 +
  AVOutputFormat ff_opus_muxer = {
      .name              = "opus",
-     .long_name         = NULL_IF_CONFIG_SMALL("Opus"),
+     .long_name         = NULL_IF_CONFIG_SMALL("Ogg Opus"),
      .mime_type         = "audio/ogg",
      .extensions        = "opus",
      .priv_data_size    = sizeof(OGGContext),
      .write_header      = ogg_write_header,
      .write_packet      = ogg_write_packet,
      .write_trailer     = ogg_write_trailer,
-     .flags             = AVFMT_TS_NEGATIVE,
+     .flags             = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH,
 -    .priv_class        = &ogg_muxer_class,
 +    .priv_class        = &opus_muxer_class,
  };
  #endif
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 56
- #define LIBAVFORMAT_VERSION_MINOR  1
+ #define LIBAVFORMAT_VERSION_MINOR  2
 -#define LIBAVFORMAT_VERSION_MICRO  0
 +#define LIBAVFORMAT_VERSION_MICRO 100
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \