Message ID | CADxeRwm3BKXLyN18hqmqYAQcOdFpx7Cj5QtskpMk1ZWdjqS0EA@mail.gmail.com |
---|---|
State | Accepted |
Headers | show |
On Sun, 1 Jan 2017, Steven Liu wrote: > > applied! > Steven, any reason you are overriding the "committer" field? I think what people typically do when pushing patches is that they only keep the authorship of the original owner, and the comitter remains the person who actually pushes the patch, in your case it should be you :). Thanks, Marton
2017-01-01 21:01 GMT+08:00 Marton Balint <cus@passwd.hu>: > > On Sun, 1 Jan 2017, Steven Liu wrote: > > >> applied! >> >> > Steven, any reason you are overriding the "committer" field? I think what > people typically do when pushing patches is that they only keep the > authorship of the original owner, and the comitter remains the person who > actually pushes the patch, in your case it should be you :). > Marton, Author: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Patch be merged by Steven Liu, and Committer is Steven Liu Any problem or any rules? > > Thanks, > Marton > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >
2017-01-01 21:22 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>: > > > 2017-01-01 21:01 GMT+08:00 Marton Balint <cus@passwd.hu>: > >> >> On Sun, 1 Jan 2017, Steven Liu wrote: >> >> >>> applied! >>> >>> >> Steven, any reason you are overriding the "committer" field? I think what >> people typically do when pushing patches is that they only keep the >> authorship of the original owner, and the comitter remains the person who >> actually pushes the patch, in your case it should be you :). >> > > Marton, > > Author: Bela Bodecs <bodecsb@vivanet.hu> > Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> > > Patch be merged by Steven Liu, and Committer is Steven Liu > Any problem or any rules? > >> >> Thanks, >> Marton >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> > > commit 03a69bd897e49a636a7c2f044f74fb96288955d4 Author: Bela Bodecs <bodecsb@vivanet.hu> Date: Sun Jan 1 20:22:34 2017 +0800 avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir Current implementation of finding duplicate segment filenames may fail if use_localtime_mkdir and use_localtime are in effect and segment_filename option expression contains subdirectories with date/time specifiers. This patch fixes this false behaviour. Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> commit 8fd3e02eee87e0830fa7ab1dbb65160e5be76d20 Author: Bela Bodecs <bodecsb@vivanet.hu> Date: Sun Jan 1 11:00:45 2017 +0800 libavformat/hlsenc: default segment name and use_localtime in hlcenc.c, in the hls_write_header() function the default format string for strftime() function contains %s specifier when use_localtime is true. This %s specifier will insert the seconds since EPOCH. But %s is not available on all system/environment. This patch check %s availabilty at runtine and alter the default format string if necessary. Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> commit 7525517593dff427021c893a1b21333510b7803b Author: Michael Niedermayer <michael@niedermayer.cc> Date: Thu Dec 29 00:34:57 2016 +0100 libavutil/random_seed: Ensure that get_generic_seed() spends at least 1/32 sec gathering entropy This may fix the failures on windows Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> commit 5dbce5120b4e05dd6d784e7ed9921c1f276acea3 Author: Moritz Barsnick <barsnick@gmx.net> Date: Fri Dec 30 18:08:14 2016 +0100 doc: document cutoff option to ac3 and adjust the option's global documentation cutoff is implemented as an option global to lavc, but supported only by a few encoders. This fact is now reflected in its documentation. ac3's support of this option is added for completeness. Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> the commit message is here .
On Sun, 1 Jan 2017, Steven Liu wrote: > > > 2017-01-01 21:22 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>: > > > 2017-01-01 21:01 GMT+08:00 Marton Balint <cus@passwd.hu>: > > On Sun, 1 Jan 2017, Steven Liu wrote: > > > applied! > > > Steven, any reason you are overriding the "committer" field? I think what people typically do when pushing patches is that they only keep the authorship of the original owner, and the > comitter remains the person who actually pushes the patch, in your case it should be you :). > > > Marton, > > Author: Bela Bodecs <bodecsb@vivanet.hu> > Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> > > Patch be merged by Steven Liu, and Committer is Steven Liu > Any problem or any rules? http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=03a69bd897e49a636a7c2f044f74fb96288955d4 Author and Committer is both Bela Bodecs. The comitter is supposed to be you IMHO. > commit 03a69bd897e49a636a7c2f044f74fb96288955d4 > Author: Bela Bodecs <bodecsb@vivanet.hu> > Date: Sun Jan 1 20:22:34 2017 +0800 > > avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir > > Current implementation of finding duplicate segment filenames may fail > if use_localtime_mkdir and use_localtime are in effect and > segment_filename option expression contains subdirectories with > date/time specifiers. This patch fixes this false behaviour. > > Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> > Signed-off-by: Steven Liu <lq@chinaffmpeg.org> > git log --pretty=full shows the committer as well, and not just the author: commit 03a69bd897e49a636a7c2f044f74fb96288955d4 Author: Bela Bodecs <bodecsb@vivanet.hu> Commit: Bela Bodecs <bodecsb@vivanet.hu> avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir Current implementation of finding duplicate segment filenames may fail if use_localtime_mkdir and use_localtime are in effect and segment_filename option expression contains subdirectories with date/time specifiers. This patch fixes this false behaviour. Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> Regards, Marton
2017-01-01 22:23 GMT+08:00 Marton Balint <cus@passwd.hu>: > > On Sun, 1 Jan 2017, Steven Liu wrote: > > >> >> 2017-01-01 21:22 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>: >> >> >> 2017-01-01 21:01 GMT+08:00 Marton Balint <cus@passwd.hu>: >> >> On Sun, 1 Jan 2017, Steven Liu wrote: >> >> >> applied! >> >> >> Steven, any reason you are overriding the "committer" field? >> I think what people typically do when pushing patches is that they only >> keep the authorship of the original owner, and the >> comitter remains the person who actually pushes the patch, in >> your case it should be you :). >> >> >> Marton, >> >> Author: Bela Bodecs <bodecsb@vivanet.hu> >> Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> >> >> Patch be merged by Steven Liu, and Committer is Steven Liu >> Any problem or any rules? >> > > http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=03a69bd > 897e49a636a7c2f044f74fb96288955d4 > > Author and Committer is both Bela Bodecs. The comitter is supposed to be > you IMHO. > > commit 03a69bd897e49a636a7c2f044f74fb96288955d4 >> Author: Bela Bodecs <bodecsb@vivanet.hu> >> Date: Sun Jan 1 20:22:34 2017 +0800 >> >> avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir >> >> Current implementation of finding duplicate segment filenames may fail >> if use_localtime_mkdir and use_localtime are in effect and >> segment_filename option expression contains subdirectories with >> date/time specifiers. This patch fixes this false behaviour. >> >> Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> >> Signed-off-by: Steven Liu <lq@chinaffmpeg.org> >> >> > git log --pretty=full shows the committer as well, and not just the author: > > commit 03a69bd897e49a636a7c2f044f74fb96288955d4 > Author: Bela Bodecs <bodecsb@vivanet.hu> > Commit: Bela Bodecs <bodecsb@vivanet.hu> Okay, I see, Thanks alot :) > > > avformat/hlsenc: Duplicated segment filenames and use_localtime_mkdir > > Current implementation of finding duplicate segment filenames may fail > if use_localtime_mkdir and use_localtime are in effect and > segment_filename option expression contains subdirectories with > date/time specifiers. This patch fixes this false behaviour. > > Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> > Signed-off-by: Steven Liu <lq@chinaffmpeg.org> > > > Regards, > Marton
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 57fc9c1..591ab73 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -367,6 +367,16 @@ static int hls_mux_init(AVFormatContext *s) return 0; } +static HLSSegment *find_segment_by_filename(HLSSegment *segment, const char *filename) +{ + while (segment) { + if (!av_strcasecmp(segment->filename,filename)) + return segment; + segment = segment->next; + } + return (HLSSegment *) NULL; +} + /* Create a new segment and append it to the segment list */ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls,