virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'

Browse Source 
* commit '9dcf2397219ca796f0fafce2a703770d6fd09920':
  lavf: Check the return value of strftime

Conflicts:
	libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-26 02:06:40 +01:00
parent 50697ac5b2 9dcf239721
commit 3b709fd912
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/wtvdec.c
View File

@@ -389,7 +389,8 @@ static int filetime_to_iso8601(char *buf, int buf_size, int64_t value)
struct tm *tm = gmtime(&t);
if (!tm)
return -1;
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
if (!strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm))
return -1;
return 0;
}
@@ -403,7 +404,8 @@ static int crazytime_to_iso8601(char *buf, int buf_size, int64_t value)
struct tm *tm = gmtime(&t);
if (!tm)
return -1;
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
if (!strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm))
return -1;
return 0;
}
@@ -417,7 +419,8 @@ static int oledate_to_iso8601(char *buf, int buf_size, int64_t value)
struct tm *tm= gmtime(&t);
if (!tm)
return -1;
strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm);
if (!strftime(buf, buf_size, "%Y-%m-%d %H:%M:%S", tm))
return -1;
return 0;
}