diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-14 22:36:23 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2011-01-14 22:36:23 +0000 |
| commit | 6dc7dc08ed66524f174ad2c0a5e32178a1173434 (patch) | |
| tree | 9d18ece4d75f00a08cafc019b384f51674a366d8 /libavformat/mxfenc.c | |
| parent | 90603f7c93a60e1b54d0d2846acd2526a1b9598d (diff) | |
In mxf muxer, check the return value of gmtime, fix #2494
Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mxfenc.c')
| -rw-r--r-- | libavformat/mxfenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index d5899393bb..c53849a769 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1379,6 +1379,8 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, static uint64_t mxf_parse_timestamp(time_t timestamp) { struct tm *time = gmtime(×tamp); + if (!time) + return 0; return (uint64_t)(time->tm_year+1900) << 48 | (uint64_t)(time->tm_mon+1) << 40 | (uint64_t) time->tm_mday << 32 | |