aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-03-08 00:19:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 01:52:52 +0100
commit9bb7e2bd90f393c6fc9b4bfa8a523018434b7aa4 (patch)
treea9f8507b8972f1f376973eeece749d4684136384
parent90fa2460c0728a0bc08dc5165476b6691c057a7b (diff)
downloadffmpeg-9bb7e2bd90f393c6fc9b4bfa8a523018434b7aa4.tar.gz
mxfdec: Fix the error handling for when strftime fails
The str variable is a char ** here. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 6448f15af02f2c3cf0df8cb8237957e426041f2d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mxfdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 0c88a8ae9c..636a3d8932 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1976,7 +1976,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;
}