Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

* commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558':
  flac muxer: add option to disable writing the global header

Conflicts:
	libavformat/version.h

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

diff --cc libavformat/flacenc.c
index 87e93625f287c9853bd12554af3eb63baac66f39,83ddf441e093f62e76cbc60bb0c7d4c37380bb28..d2e274cf2f2c0aefe82865d0edb1a7d106008703
--- 1/libavformat/flacenc.c
--- 2/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@@ -19,9 -19,9 +19,10 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
+ #include "libavutil/opt.h"
  #include "libavcodec/flac.h"
  #include "avformat.h"
 +#include "avio_internal.h"
  #include "flacenc.h"
  #include "vorbiscomment.h"
  #include "libavcodec/bytestream.h"
@@@ -66,16 -74,11 +72,20 @@@ static int flac_write_header(struct AVF
  {
      int ret;
      AVCodecContext *codec = s->streams[0]->codec;
+     FlacMuxerContext *c   = s->priv_data;
+ 
+     if (!c->write_header)
+         return 0;
  
 +    if (s->nb_streams > 1) {
 +        av_log(s, AV_LOG_ERROR, "only one stream is supported\n");
 +        return AVERROR(EINVAL);
 +    }
 +    if (codec->codec_id != AV_CODEC_ID_FLAC) {
 +        av_log(s, AV_LOG_ERROR, "unsupported codec\n");
 +        return AVERROR(EINVAL);
 +    }
 +
      ret = ff_flac_write_header(s->pb, codec, 0);
      if (ret)
          return ret;

diff --cc libavformat/version.h
index 2b110d433f4a9839fe042bca5f8e701ba9665c81,676842688a2e7a45e07417df7eb53330a8621e52..b45e24fdeaa6cbb3e0033e4364bde6b36f2a22f9
--- 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 10
 -#define LIBAVFORMAT_VERSION_MICRO  2
 +#define LIBAVFORMAT_VERSION_MINOR 22
- #define LIBAVFORMAT_VERSION_MICRO 102
++#define LIBAVFORMAT_VERSION_MICRO 103
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \