diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 19:55:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 19:59:30 +0100 |
| commit | fd503e96ef9b5e6b234bfd0e531176743490d18d (patch) | |
| tree | 7484f1b52855db93a78af4db86a1d5d25126c2ee | |
| parent | 3360c6ac0c21cbb229c238197f806da40a8bc295 (diff) | |
| parent | 6448f15af02f2c3cf0df8cb8237957e426041f2d (diff) | |
| download | ffmpeg-fd503e96ef9b5e6b234bfd0e531176743490d18d.tar.gz | |
Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'
* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d':
mxfdec: Fix the error handling for when strftime fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mxfdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 2e8dd05ab4..e8fa7312a1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -2041,7 +2041,7 @@ static int mxf_timestamp_to_str(uint64_t timestamp, char **str) if (!*str) return AVERROR(ENOMEM); if (!strftime(*str, 32, "%Y-%m-%d %H:%M:%S", &time)) - str[0] = '\0'; + (*str)[0] = '\0'; return 0; } |