> 在 2019年12月16日，08:04，Andreas Rheinhardt <andreas.rheinha...@gmail.com> 写道： > > "If an error is detected, localtime_r() shall return a null pointer > and set errno to indicate the error." Yet in case this happened in > hls_init(), AVERROR(ENOMEM) has been returned. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com> > --- > libavformat/hlsenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > index b3f9582267..669641885e 100644 > --- a/libavformat/hlsenc.c > +++ b/libavformat/hlsenc.c > @@ -2747,7 +2747,7 @@ static int hls_init(AVFormatContext *s) > char b[15]; > struct tm *p, tmbuf; > if (!(p = localtime_r(&t, &tmbuf))) > - return AVERROR(ENOMEM); > + return AVERROR(errno); > if (!strftime(b, sizeof(b), "%Y%m%d%H%M%S", p)) > return AVERROR(ENOMEM); > hls->start_sequence = strtoll(b, NULL, 10); > -- > 2.20.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
LGTM Thanks Steven _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
