Commit fd503e96 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6448f15a'

* commit '6448f15a':
  mxfdec: Fix the error handling for when strftime fails
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3360c6ac 6448f15a
...@@ -2041,7 +2041,7 @@ static int mxf_timestamp_to_str(uint64_t timestamp, char **str) ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment