diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 13:35:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 13:35:49 +0100 |
| commit | 5de1f7a7bd8a69d1cbf4f31816f996c99d545a10 (patch) | |
| tree | ac4816768fb314f3dcd844592d2a544a3ad1348c /libavformat/hlsenc.c | |
| parent | 9f92e590ba91faa1283b1a9a35dd7e43c5bd998b (diff) | |
| parent | 18e6f087c4a50bede8449ee164778945480be50c (diff) | |
Merge commit '18e6f087c4a50bede8449ee164778945480be50c'
* commit '18e6f087c4a50bede8449ee164778945480be50c':
img2: document the options available
hls: improve options description
hls: use a meaningful long name
hls: add start_number option
h264: check for invalid zeros_left before writing
Conflicts:
doc/demuxers.texi
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ecf07ef07f..69be9ad289 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -295,6 +295,7 @@ static int hls_write_trailer(struct AVFormatContext *s) #define OFFSET(x) offsetof(HLSContext, x) #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { + { "start_number", "first number in the sequence", OFFSET(number), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E}, {"hls_time", "segment length in seconds", OFFSET(time), AV_OPT_TYPE_FLOAT, {.dbl = 2}, 0, FLT_MAX, E}, {"hls_list_size", "maximum number of playlist entries", OFFSET(size), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E}, {"hls_wrap", "number after which the index wraps", OFFSET(wrap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E}, @@ -311,7 +312,7 @@ static const AVClass hls_class = { AVOutputFormat ff_hls_muxer = { .name = "hls", - .long_name = NULL_IF_CONFIG_SMALL("hls"), + .long_name = NULL_IF_CONFIG_SMALL("Apple HTTP Live Streaming"), .extensions = "m3u8", .priv_data_size = sizeof(HLSContext), .audio_codec = AV_CODEC_ID_MP2, |