diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:58:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:59:35 +0100 |
| commit | 5a4852bc4d6446f1fc158b2e6c41cb0f3c8b98aa (patch) | |
| tree | 6896e4ade41cf792bf53e240c3b3343610e37186 /libavformat/mxfdec.c | |
| parent | 3ce858141309c09294177e63d9a36cd0924dc200 (diff) | |
| parent | 570af382eea902afe09f3562e5e1b483981cca7e (diff) | |
Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'
* commit '570af382eea902afe09f3562e5e1b483981cca7e':
mxf: Handle identification metadata
Conflicts:
libavformat/mxfdec.c
See: 25b143aa7bd60d348a449be64dadab61f0c7d068
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfdec.c')
| -rw-r--r-- | libavformat/mxfdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 50995e1534..3fcee1aa31 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1663,7 +1663,7 @@ static int mxf_read_utf16_string(AVIOContext *pb, int size, char** str) if (size < 0) return AVERROR(EINVAL); - buf_size = size + size/2 + 1; + buf_size = size + size / 2 + 1; *str = av_malloc(buf_size); if (!*str) return AVERROR(ENOMEM); @@ -1696,7 +1696,7 @@ static int mxf_uid_to_str(UID uid, char **str) static int mxf_timestamp_to_str(uint64_t timestamp, char **str) { - struct tm time = {0}; + struct tm time = { 0 }; time.tm_year = (timestamp >> 48) - 1900; time.tm_mon = (timestamp >> 40 & 0xFF) - 1; time.tm_mday = (timestamp >> 32 & 0xFF); |