diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-30 01:57:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-30 01:57:21 +0100 |
| commit | 0ffb61e8cabf35e6022a33a1324fe9ef58ab85a5 (patch) | |
| tree | 0d3075db4303c9baf14c5f2a12ab40be6c9a2a2e | |
| parent | e5a3766767a104e6fdd7adcfafb8e90da5872041 (diff) | |
| parent | 8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7 (diff) | |
| download | ffmpeg-0ffb61e8cabf35e6022a33a1324fe9ef58ab85a5.tar.gz | |
Merge commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7'
* commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7':
dashenc: Remove some stray double spaces
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/dashenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 72d048484f..7a0486f628 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -924,8 +924,8 @@ static const AVOption options[] = { { "use_timeline", "Use SegmentTimeline in SegmentTemplate", OFFSET(use_timeline), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, E }, { "single_file", "Store all segments in one file, accessed using byte ranges", OFFSET(single_file), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, E }, { "single_file_name", "DASH-templated name to be used for baseURL. Implies storing all segments in one file, accessed using byte ranges", OFFSET(single_file_name), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E }, - { "init_seg_name", "DASH-templated name to used for the initialization segment", OFFSET(init_seg_name), AV_OPT_TYPE_STRING, {.str = "init-stream$RepresentationID$.m4s"}, 0, 0, E }, - { "media_seg_name", "DASH-templated name to used for the media segments", OFFSET(media_seg_name), AV_OPT_TYPE_STRING, {.str = "chunk-stream$RepresentationID$-$Number%05d$.m4s"}, 0, 0, E }, + { "init_seg_name", "DASH-templated name to used for the initialization segment", OFFSET(init_seg_name), AV_OPT_TYPE_STRING, {.str = "init-stream$RepresentationID$.m4s"}, 0, 0, E }, + { "media_seg_name", "DASH-templated name to used for the media segments", OFFSET(media_seg_name), AV_OPT_TYPE_STRING, {.str = "chunk-stream$RepresentationID$-$Number%05d$.m4s"}, 0, 0, E }, { NULL }, }; |