Merge commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7'

* commit '95b7fa1729b93bbb3f4fb85a5c0cb53cf970c3c7':
  oggenc: Support flushing the muxer

Conflicts:
	libavformat/version.h

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

diff --cc libavformat/oggenc.c
index bec3917a219ef3aaa38bdb0fafe027558df2aaa3,0d8e239e02d82314666b14dc6ca2d0ff3c027581..6c50fc3521e5e640c8d5a47e15b939e39fac21fa
--- 1/libavformat/oggenc.c
--- 2/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@@ -647,79 -640,6 +664,79 @@@ AVOutputFormat ff_ogg_muxer = 
      .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,
  };
 +#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"),
 +    .mime_type         = "audio/ogg",
 +    .extensions        = "oga",
 +    .priv_data_size    = sizeof(OGGContext),
 +    .audio_codec       = AV_CODEC_ID_VORBIS,
 +    .video_codec       = AV_CODEC_ID_NONE,
 +    .write_header      = ogg_write_header,
 +    .write_packet      = ogg_write_packet,
 +    .write_trailer     = ogg_write_trailer,
 +    .flags             = AVFMT_TS_NEGATIVE,
 +    .priv_class        = &oga_muxer_class,
 +};
 +#endif
 +
 +#if CONFIG_SPEEX_MUXER
 +static const AVClass speex_muxer_class = {
 +    .class_name = "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"),
 +    .mime_type         = "audio/ogg",
 +    .extensions        = "spx",
 +    .priv_data_size    = sizeof(OGGContext),
 +    .audio_codec       = AV_CODEC_ID_SPEEX,
 +     .video_codec      = AV_CODEC_ID_NONE,
 +    .write_header      = ogg_write_header,
 +    .write_packet      = ogg_write_packet,
 +    .write_trailer     = ogg_write_trailer,
 +    .flags             = AVFMT_TS_NEGATIVE,
 +    .priv_class        = &speex_muxer_class,
 +};
 +#endif
 +
 +#if CONFIG_OPUS_MUXER
 +static const AVClass opus_muxer_class = {
 +    .class_name = "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"),
 +    .mime_type         = "audio/ogg",
 +    .extensions        = "opus",
 +    .priv_data_size    = sizeof(OGGContext),
 +    .audio_codec       = AV_CODEC_ID_OPUS,
 +    .video_codec       = AV_CODEC_ID_NONE,
 +    .write_header      = ogg_write_header,
 +    .write_packet      = ogg_write_packet,
 +    .write_trailer     = ogg_write_trailer,
 +    .flags             = AVFMT_TS_NEGATIVE,
 +    .priv_class        = &opus_muxer_class,
 +};
 +#endif

diff --cc libavformat/version.h
index 6f7aa7d31ef1a110fc67ffe5d32992ad4a7c6ef8,57970cd250c2d0e42ee35baad39ab83ed477a9a3..47b22b515683b5a6030e710afd3d22a87dab476b
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 55
 -#define LIBAVFORMAT_VERSION_MINOR 19
 -#define LIBAVFORMAT_VERSION_MICRO  1
 +#define LIBAVFORMAT_VERSION_MINOR 42
- #define LIBAVFORMAT_VERSION_MICRO 100
++#define LIBAVFORMAT_VERSION_MICRO 101
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \