[FFmpeg-cvslog] avutil/parseutils: dont assume standard time when parsing a timestamp

Marton Balint git at videolan.org
Mon Jul 11 01:25:51 CEST 2016


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Wed Jun 29 22:37:25 2016 +0200| [593987810ef88bcc9b3d6aa7ba83fe68728c9dfa] | committer: Marton Balint

avutil/parseutils: dont assume standard time when parsing a timestamp

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=593987810ef88bcc9b3d6aa7ba83fe68728c9dfa
---

 libavutil/parseutils.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index a4efd79..86d3dac 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -687,6 +687,7 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
             dt2.tm_sec  = dt.tm_sec;
             dt = dt2;
         }
+        dt.tm_isdst = is_utc ? 0 : -1;
         t = is_utc ? av_timegm(&dt) : mktime(&dt);
         t += tzoffset;
     }



More information about the ffmpeg-cvslog mailing list