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 | |
| parent | 9f92e590ba91faa1283b1a9a35dd7e43c5bd998b (diff) | |
| parent | 18e6f087c4a50bede8449ee164778945480be50c (diff) | |
| download | ffmpeg-5de1f7a7bd8a69d1cbf4f31816f996c99d545a10.tar.gz | |
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>
| -rw-r--r-- | doc/muxers.texi | 16 | ||||
| -rw-r--r-- | libavformat/hlsenc.c | 3 |
2 files changed, 15 insertions, 4 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 1c8f93bdb0..2bb987ca01 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -145,9 +145,14 @@ ffmpeg -i in.nut out.m3u8 @end example @table @option -@item -hls_time segment length in seconds -@item -hls_list_size maximum number of playlist entries -@item -hls_wrap number after which index wraps +@item -hls_time @var{seconds} +Set the segment length in seconds. +@item -hls_list_size @var{size} +Set the maximum number of playlist entries. +@item -hls_wrap @var{wrap} +Set the number after which index wraps. +@item -start_number @var{number} +Start the sequence from @var{number}. @end table @anchor{ico} @@ -235,6 +240,11 @@ Note also that the pattern must not necessarily contain "%d" or ffmpeg -i in.avi -f image2 -frames:v 1 img.jpeg @end example +@table @option +@item -start_number @var{number} +Start the sequence from @var{number}. +@end table + The image muxer supports the .Y.U.V image file format. This format is special in that that each image frame consists of three files, for each of the YUV420P components. To read or write this image file format, 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, |