Browse Source

Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'

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

Conflicts:
	libavformat/mov.c

See: f31445a82d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Michael Niedermayer 11 years ago
parent
commit
02444f02f1
1 changed files with 0 additions and 1 deletions
  1. +0
    -1
      libavformat/mov.c

+ 0
- 1
libavformat/mov.c View File

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



Loading…
Cancel
Save