virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'

Browse Source 
* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
	libavformat/mxfdec.c

See: 25b143aa7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-06 22:58:46 +01:00
commit 5a4852bc4d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mxfdec.c
View File

@ -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);