diff mbox

[FFmpeg-devel] increment initial_prog_date_time when removing old segments

Message ID CADxeRwm+GYNG3Z66nomsOJ0Ov-w=24NbqjKiWBnCuxRiTPZGCQ@mail.gmail.com
State Accepted
Commit c0dc9df2cc6321155e8a7a2a6c66be54746e5c13
Headers show

Commit Message

Steven Liu Nov. 11, 2016, 1:58 p.m. UTC 
2016-11-11 21:40 GMT+08:00 Michael Niedermayer <michael@niedermayer.cc>:

> On Fri, Nov 11, 2016 at 10:13:43AM +0100, Robert Nagy wrote:
> > Fixes https://trac.ffmpeg.org/ticket/5940#ticket
> >
> > ---
> >  libavformat/hlsenc.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> > index 9ca2df7..80a598a 100644
> > --- a/libavformat/hlsenc.c
> > +++ b/libavformat/hlsenc.c
> > @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext *hls)
> {
> >      segment = hls->old_segments;
> >      while (segment) {
> >          playlist_duration -= segment->duration;
> > +        initial_prog_date_time += segment->duration;
>
> src/libavformat/hlsenc.c: In function ‘hls_delete_old_segments’:
> src/libavformat/hlsenc.c:186:9: error: ‘initial_prog_date_time’
> undeclared (first use in this function)
> src/libavformat/hlsenc.c:186:9: note: each undeclared identifier is
> reported only once for each function it appears in
>
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Those who would give up essential Liberty, to purchase a little
> temporary Safety, deserve neither Liberty nor Safety -- Benjamin Franklin
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>
From 4cb283e3796b53c93cfded381c4606304a6ec706 Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronag89@gmail.com>
Date: Fri, 11 Nov 2016 21:56:00 +0800
Subject: [PATCH] increment initial_prog_date_time when removing old segments

Fixes https://trac.ffmpeg.org/ticket/5940#ticket

Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>>
Signed-off-by: Robert Nagy <ronag89@gmail.com>
Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
---
 libavformat/hlsenc.c | 1 +
 1 file changed, 1 insertion(+)

--
2.9.3 (Apple Git-75)

Comments

Steven Liu Nov. 11, 2016, 1:59 p.m. UTC | #1 
2016-11-11 21:58 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>:

>
>
> 2016-11-11 21:40 GMT+08:00 Michael Niedermayer <michael@niedermayer.cc>:
>
>> On Fri, Nov 11, 2016 at 10:13:43AM +0100, Robert Nagy wrote:
>> > Fixes https://trac.ffmpeg.org/ticket/5940#ticket
>> >
>> > ---
>> >  libavformat/hlsenc.c | 1 +
>> >  1 file changed, 1 insertion(+)
>> >
>> > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
>> > index 9ca2df7..80a598a 100644
>> > --- a/libavformat/hlsenc.c
>> > +++ b/libavformat/hlsenc.c
>> > @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext
>> *hls) {
>> >      segment = hls->old_segments;
>> >      while (segment) {
>> >          playlist_duration -= segment->duration;
>> > +        initial_prog_date_time += segment->duration;
>>
>> src/libavformat/hlsenc.c: In function ‘hls_delete_old_segments’:
>> src/libavformat/hlsenc.c:186:9: error: ‘initial_prog_date_time’
>> undeclared (first use in this function)
>> src/libavformat/hlsenc.c:186:9: note: each undeclared identifier is
>> reported only once for each function it appears in
>>
>>
>> [...]
>>
>> --
>> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>>
>> Those who would give up essential Liberty, to purchase a little
>> temporary Safety, deserve neither Liberty nor Safety -- Benjamin Franklin
>>
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel@ffmpeg.org
>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>>
> From 4cb283e3796b53c93cfded381c4606304a6ec706 Mon Sep 17 00:00:00 2001
> From: Robert Nagy <ronag89@gmail.com>
> Date: Fri, 11 Nov 2016 21:56:00 +0800
> Subject: [PATCH] increment initial_prog_date_time when removing old
> segments
>
> Fixes https://trac.ffmpeg.org/ticket/5940#ticket
>
> Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>>
> Signed-off-by: Robert Nagy <ronag89@gmail.com>
> Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
> ---
>  libavformat/hlsenc.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index 9ca2df7..e16fb0c 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext *hls) {
>      segment = hls->old_segments;
>      while (segment) {
>          playlist_duration -= segment->duration;
> +        hls->initial_prog_date_time += segment->duration;
>          previous_segment = segment;
>          segment = previous_segment->next;
>          if (playlist_duration <= -previous_segment->duration) {
> --
> 2.9.3 (Apple Git-75)
>
>
Michael Niedermayer Nov. 11, 2016, 4:53 p.m. UTC | #2 
On Fri, Nov 11, 2016 at 09:59:16PM +0800, Steven Liu wrote:
> 2016-11-11 21:58 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>:
> 
> >
> >
> > 2016-11-11 21:40 GMT+08:00 Michael Niedermayer <michael@niedermayer.cc>:
> >
> >> On Fri, Nov 11, 2016 at 10:13:43AM +0100, Robert Nagy wrote:
> >> > Fixes https://trac.ffmpeg.org/ticket/5940#ticket
> >> >
> >> > ---
> >> >  libavformat/hlsenc.c | 1 +
> >> >  1 file changed, 1 insertion(+)
> >> >
> >> > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> >> > index 9ca2df7..80a598a 100644
> >> > --- a/libavformat/hlsenc.c
> >> > +++ b/libavformat/hlsenc.c
> >> > @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext
> >> *hls) {
> >> >      segment = hls->old_segments;
> >> >      while (segment) {
> >> >          playlist_duration -= segment->duration;
> >> > +        initial_prog_date_time += segment->duration;
> >>
> >> src/libavformat/hlsenc.c: In function ‘hls_delete_old_segments’:
> >> src/libavformat/hlsenc.c:186:9: error: ‘initial_prog_date_time’
> >> undeclared (first use in this function)
> >> src/libavformat/hlsenc.c:186:9: note: each undeclared identifier is
> >> reported only once for each function it appears in
> >>
> >>
> >> [...]
> >>
> >> --
> >> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
> >>
> >> Those who would give up essential Liberty, to purchase a little
> >> temporary Safety, deserve neither Liberty nor Safety -- Benjamin Franklin
> >>
> >> _______________________________________________
> >> ffmpeg-devel mailing list
> >> ffmpeg-devel@ffmpeg.org
> >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >>
> >>
> > From 4cb283e3796b53c93cfded381c4606304a6ec706 Mon Sep 17 00:00:00 2001
> > From: Robert Nagy <ronag89@gmail.com>
> > Date: Fri, 11 Nov 2016 21:56:00 +0800
> > Subject: [PATCH] increment initial_prog_date_time when removing old
> > segments
> >
> > Fixes https://trac.ffmpeg.org/ticket/5940#ticket
> >
> > Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>>
> > Signed-off-by: Robert Nagy <ronag89@gmail.com>
> > Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
> > ---
> >  libavformat/hlsenc.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> > index 9ca2df7..e16fb0c 100644
> > --- a/libavformat/hlsenc.c
> > +++ b/libavformat/hlsenc.c
> > @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext *hls) {
> >      segment = hls->old_segments;
> >      while (segment) {
> >          playlist_duration -= segment->duration;
> > +        hls->initial_prog_date_time += segment->duration;
> >          previous_segment = segment;
> >          segment = previous_segment->next;
> >          if (playlist_duration <= -previous_segment->duration) {
> > --
> > 2.9.3 (Apple Git-75)
> >
> >

>  hlsenc.c |    1 +
>  1 file changed, 1 insertion(+)
> e3727b4f357c8277b28056aec982e89e85efb4a3  0001-increment-initial_prog_date_time-when-removing-old-s.patch
> From 4cb283e3796b53c93cfded381c4606304a6ec706 Mon Sep 17 00:00:00 2001
> From: Robert Nagy <ronag89@gmail.com>
> Date: Fri, 11 Nov 2016 21:56:00 +0800
> Subject: [PATCH] increment initial_prog_date_time when removing old segments
> 
> Fixes https://trac.ffmpeg.org/ticket/5940#ticket
> 
> Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>>
> Signed-off-by: Robert Nagy <ronag89@gmail.com>
> Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
> ---
>  libavformat/hlsenc.c | 1 +
>  1 file changed, 1 insertion(+)

LGTM

thx

[...]
Steven Liu Nov. 12, 2016, 9:17 a.m. UTC | #3 
2016-11-12 0:53 GMT+08:00 Michael Niedermayer <michael@niedermayer.cc>:

> On Fri, Nov 11, 2016 at 09:59:16PM +0800, Steven Liu wrote:
> > 2016-11-11 21:58 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>:
> >
> > >
> > >
> > > 2016-11-11 21:40 GMT+08:00 Michael Niedermayer <michael@niedermayer.cc
> >:
> > >
> > >> On Fri, Nov 11, 2016 at 10:13:43AM +0100, Robert Nagy wrote:
> > >> > Fixes https://trac.ffmpeg.org/ticket/5940#ticket
> > >> >
> > >> > ---
> > >> >  libavformat/hlsenc.c | 1 +
> > >> >  1 file changed, 1 insertion(+)
> > >> >
> > >> > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> > >> > index 9ca2df7..80a598a 100644
> > >> > --- a/libavformat/hlsenc.c
> > >> > +++ b/libavformat/hlsenc.c
> > >> > @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext
> > >> *hls) {
> > >> >      segment = hls->old_segments;
> > >> >      while (segment) {
> > >> >          playlist_duration -= segment->duration;
> > >> > +        initial_prog_date_time += segment->duration;
> > >>
> > >> src/libavformat/hlsenc.c: In function ‘hls_delete_old_segments’:
> > >> src/libavformat/hlsenc.c:186:9: error: ‘initial_prog_date_time’
> > >> undeclared (first use in this function)
> > >> src/libavformat/hlsenc.c:186:9: note: each undeclared identifier is
> > >> reported only once for each function it appears in
> > >>
> > >>
> > >> [...]
> > >>
> > >> --
> > >> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC7
> 87040B0FAB
> > >>
> > >> Those who would give up essential Liberty, to purchase a little
> > >> temporary Safety, deserve neither Liberty nor Safety -- Benjamin
> Franklin
> > >>
> > >> _______________________________________________
> > >> ffmpeg-devel mailing list
> > >> ffmpeg-devel@ffmpeg.org
> > >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> > >>
> > >>
> > > From 4cb283e3796b53c93cfded381c4606304a6ec706 Mon Sep 17 00:00:00 2001
> > > From: Robert Nagy <ronag89@gmail.com>
> > > Date: Fri, 11 Nov 2016 21:56:00 +0800
> > > Subject: [PATCH] increment initial_prog_date_time when removing old
> > > segments
> > >
> > > Fixes https://trac.ffmpeg.org/ticket/5940#ticket
> > >
> > > Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>>
> > > Signed-off-by: Robert Nagy <ronag89@gmail.com>
> > > Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
> > > ---
> > >  libavformat/hlsenc.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> > > index 9ca2df7..e16fb0c 100644
> > > --- a/libavformat/hlsenc.c
> > > +++ b/libavformat/hlsenc.c
> > > @@ -183,6 +183,7 @@ static int hls_delete_old_segments(HLSContext
> *hls) {
> > >      segment = hls->old_segments;
> > >      while (segment) {
> > >          playlist_duration -= segment->duration;
> > > +        hls->initial_prog_date_time += segment->duration;
> > >          previous_segment = segment;
> > >          segment = previous_segment->next;
> > >          if (playlist_duration <= -previous_segment->duration) {
> > > --
> > > 2.9.3 (Apple Git-75)
> > >
> > >
>
> >  hlsenc.c |    1 +
> >  1 file changed, 1 insertion(+)
> > e3727b4f357c8277b28056aec982e89e85efb4a3  0001-increment-initial_prog_
> date_time-when-removing-old-s.patch
> > From 4cb283e3796b53c93cfded381c4606304a6ec706 Mon Sep 17 00:00:00 2001
> > From: Robert Nagy <ronag89@gmail.com>
> > Date: Fri, 11 Nov 2016 21:56:00 +0800
> > Subject: [PATCH] increment initial_prog_date_time when removing old
> segments
> >
> > Fixes https://trac.ffmpeg.org/ticket/5940#ticket
> >
> > Reviewed-by: Michael Niedermayer <<michael@niedermayer.cc>>
> > Signed-off-by: Robert Nagy <ronag89@gmail.com>
> > Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
> > ---
> >  libavformat/hlsenc.c | 1 +
> >  1 file changed, 1 insertion(+)
>
> LGTM
>
> thx
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Into a blind darkness they enter who follow after the Ignorance,
> they as if into a greater darkness enter who devote themselves
> to the Knowledge alone. -- Isha Upanishad
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>
Applied!


Thanksa
diff mbox

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 9ca2df7..e16fb0c 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -183,6 +183,7 @@  static int hls_delete_old_segments(HLSContext *hls) {
     segment = hls->old_segments;
     while (segment) {
         playlist_duration -= segment->duration;
+        hls->initial_prog_date_time += segment->duration;
         previous_segment = segment;
         segment = previous_segment->next;
         if (playlist_duration <= -previous_segment->duration) {