virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

Browse Source 
* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d':
  mxfdec: Fix the error handling for when strftime fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-08 19:55:09 +01:00
parent 3360c6ac0c 6448f15af0
commit fd503e96ef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mxfdec.c
View File

@@ -2041,7 +2041,7 @@ static int mxf_timestamp_to_str(uint64_t timestamp, char **str)
if (!*str) if (!*str)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (!strftime(*str, 32, "%Y-%m-%d %H:%M:%S", &time)) if (!strftime(*str, 32, "%Y-%m-%d %H:%M:%S", &time))
str[0] = '\0'; (*str)[0] = '\0';
return 0; return 0;
} }