Merge commit '55f03d872640175a00bfa262da4652b7312b905f'

* commit '55f03d872640175a00bfa262da4652b7312b905f':
  hlsenc: Add parameter -hls_allow_cache

Conflicts:
	doc/muxers.texi
	libavformat/hlsenc.c
	libavformat/version.h

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

doc/muxers.texi

@@ -243,8 +243,7 @@ Start the playlist sequence number from @var{number}. Default value is
 0.
 
 @item hls_allow_cache @var{allowcache}
-Explicitly set whether the client MAY (1) or MUST NOT (0) cache media
-segments.
+Explicitly set whether the client MAY (1) or MUST NOT (0) cache media segments.
 
 @item hls_base_url @var{baseurl}
 Append @var{baseurl} to every entry in the playlist.

libavformat/hlsenc.c

@@ -61,7 +61,6 @@ typedef struct HLSContext {
     uint32_t flags;        // enum HLSFlags
 
     int allowcache;
-
     int64_t recording_time;
     int has_video;
     int64_t start_pts;

libavformat/version.h

@@ -31,7 +31,7 @@
 
 #define LIBAVFORMAT_VERSION_MAJOR 56
 #define LIBAVFORMAT_VERSION_MINOR  7
-#define LIBAVFORMAT_VERSION_MICRO 102
+#define LIBAVFORMAT_VERSION_MICRO 103
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \