diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 21:43:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-03 21:46:40 +0200 |
| commit | 883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c (patch) | |
| tree | 7a11e3ae930a8d765adc61d11bd52cb9fc8cc461 | |
| parent | dd3bfe3cc1ca26d0fff3a3baf61a40207032143f (diff) | |
| parent | 55f03d872640175a00bfa262da4652b7312b905f (diff) | |
| download | ffmpeg-883bc7d2e7c7e6ba6710b0d5c41e5a584297f66c.tar.gz | |
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>
| -rw-r--r-- | doc/muxers.texi | 3 | ||||
| -rw-r--r-- | libavformat/hlsenc.c | 1 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 44931e7307..c56330fcee 100644 --- a/doc/muxers.texi +++ b/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. diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 1d70621573..b5535727bc 100644 --- a/libavformat/hlsenc.c +++ b/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; diff --git a/libavformat/version.h b/libavformat/version.h index 2835f05cab..be2817e90d 100644 --- a/libavformat/version.h +++ b/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, \ |