[FFmpeg-devel] avformat/hlsenc: start_number new options

Submitted by Nicolas George on Jan. 12, 2017, 1:02 p.m.

Details

Message ID 20170112130242.GA420350@phare.normalesup.org
State New
Headers show

Commit Message

Nicolas George Jan. 12, 2017, 1:02 p.m.
Le tridi 23 nivôse, an CCXXV, Steven Liu a écrit :
> Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
> Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
> ---
>  doc/muxers.texi      | 29 ++++++++++++++++++++++++++--
>  libavformat/hlsenc.c | 54
> +++++++++++++++++++++++++++++++++++++++++-----------
>  2 files changed, 70 insertions(+), 13 deletions(-)
> 
> 
> applied

Breaks compilation. Will apply this very soon.

Regards,

Comments

Steven Liu Jan. 12, 2017, 2:23 p.m.
2017-01-12 21:02 GMT+08:00 Nicolas George <george@nsup.org>:

> Le tridi 23 nivôse, an CCXXV, Steven Liu a écrit :
> > Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
> > Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
> > ---
> >  doc/muxers.texi      | 29 ++++++++++++++++++++++++++--
> >  libavformat/hlsenc.c | 54
> > +++++++++++++++++++++++++++++++++++++++++-----------
> >  2 files changed, 70 insertions(+), 13 deletions(-)
> >
> >
> > applied
>
> Breaks compilation. Will apply this very soon.
>
should be ok!

>
> Regards,
>
> --
>   Nicolas George
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>

Patch hide | download patch | download mbox

From 57789cfb9d899205fc2c5b79733a43dce67c67df Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Thu, 12 Jan 2017 14:01:22 +0100
Subject: [PATCH] lavf/hlsenc: fix typo in last commit.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavformat/hlsenc.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 3bb15d3f92..1c02ee81ad 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -992,11 +992,11 @@  static int hls_write_header(AVFormatContext *s)
     int basename_size;
     int vtt_basename_size;
 
-    if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH || hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) {
+    if (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH || hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_FORMATTED_DATETIME) {
         time_t t = time(NULL); // we will need it in either case
-        if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH) {
+        if (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH) {
             hls->start_sequence = (int64_t)t;
-        } else if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) {
+        } else if (hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_FORMATTED_DATETIME) {
             char b[15];
             struct tm *p, tmbuf;
             if (!(p = localtime_r(&t, &tmbuf)))
@@ -1395,10 +1395,10 @@  static const AVOption options[] = {
     {"event", "EVENT playlist", 0, AV_OPT_TYPE_CONST, {.i64 = PLAYLIST_TYPE_EVENT }, INT_MIN, INT_MAX, E, "pl_type" },
     {"vod", "VOD playlist", 0, AV_OPT_TYPE_CONST, {.i64 = PLAYLIST_TYPE_VOD }, INT_MIN, INT_MAX, E, "pl_type" },
     {"method", "set the HTTP method", OFFSET(method), AV_OPT_TYPE_STRING, {.str = NULL},  0, 0,    E},
-    {"hls_start_number_source", "set source of first number in sequence", OFFSET(start_sequence_source_type), AV_OPT_TYPE_INT, {.i64 = HLS_START_SEQUNCE_AS_START_NUMBER }, 0, HLS_START_SEQUNCE_AS_FORMATTED_DATETIME, E, "start_sequence_source_type" },
-    {"generic", "start_number value (default)", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUNCE_AS_START_NUMBER }, INT_MIN, INT_MAX, E, "start_sequence_source_type" },
-    {"epoch", "seconds since epoch", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH }, INT_MIN, INT_MAX, E, "start_sequence_source_type" },
-    {"datetime", "current datetime as YYYYMMDDhhmmss", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUNCE_AS_FORMATTED_DATETIME }, INT_MIN, INT_MAX, E, "start_sequence_source_type" },
+    {"hls_start_number_source", "set source of first number in sequence", OFFSET(start_sequence_source_type), AV_OPT_TYPE_INT, {.i64 = HLS_START_SEQUENCE_AS_START_NUMBER }, 0, HLS_START_SEQUENCE_AS_FORMATTED_DATETIME, E, "start_sequence_source_type" },
+    {"generic", "start_number value (default)", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUENCE_AS_START_NUMBER }, INT_MIN, INT_MAX, E, "start_sequence_source_type" },
+    {"epoch", "seconds since epoch", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH }, INT_MIN, INT_MAX, E, "start_sequence_source_type" },
+    {"datetime", "current datetime as YYYYMMDDhhmmss", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUENCE_AS_FORMATTED_DATETIME }, INT_MIN, INT_MAX, E, "start_sequence_source_type" },
     { NULL },
 };
 
-- 
2.11.0