1. ffmpeg
  2. Commit 883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c
Browse code

Merge commit '55f03d872640175a00bfa262da4652b7312b905f'

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

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

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

Michael Niedermayer authored on 2014/10/04 04:43:46
Showing 3 changed files
doc/muxers.texi
History View file @ 883bc7d
... ... 
@@ -243,8 +243,7 @@ Start the playlist sequence number from @var{number}. Default value is
243 243 
 0.
244 244
245 245 
 @item hls_allow_cache @var{allowcache}
246 
-Explicitly set whether the client MAY (1) or MUST NOT (0) cache media
247 
-segments.
246 
+Explicitly set whether the client MAY (1) or MUST NOT (0) cache media segments.
248 247
249 248 
 @item hls_base_url @var{baseurl}
250 249 
 Append @var{baseurl} to every entry in the playlist.
libavformat/hlsenc.c
History View file @ 883bc7d
... ... 
@@ -61,7 +61,6 @@ typedef struct HLSContext {
61 61 
     uint32_t flags;        // enum HLSFlags
62 62
63 63 
     int allowcache;
64 
-
65 64 
     int64_t recording_time;
66 65 
     int has_video;
67 66 
     int64_t start_pts;
libavformat/version.h
History View file @ 883bc7d
... ... 
@@ -31,7 +31,7 @@
31 31
32 32 
 #define LIBAVFORMAT_VERSION_MAJOR 56
33 33 
 #define LIBAVFORMAT_VERSION_MINOR  7
34 
-#define LIBAVFORMAT_VERSION_MICRO 102
34 
+#define LIBAVFORMAT_VERSION_MICRO 103
35 35
36 36 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
37 37 
                                                LIBAVFORMAT_VERSION_MINOR, \