Commit 02444f02 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3cec81f4'

* commit '3cec81f4':
  mov: allocate the tag value dynamically

Conflicts:
	libavformat/mov.c

See: f31445a8Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 781a5a39 3cec81f4
......@@ -385,7 +385,6 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
key, str, (char*)&atom.type, str_size_alloc, atom.size);
av_freep(&str);
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