mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'
* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d': mxfdec: Fix the error handling for when strftime fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
fd503e96ef
@ -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;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user