diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:26:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:26:40 +0100 |
| commit | 02444f02f17d0ca059c19290788aa0fef2afac3a (patch) | |
| tree | a62ea9cb59232e0d0e8dbdb0b88b0d50d3ca71ec | |
| parent | 781a5a392c4d0da5250c28a153c14f88aad09a73 (diff) | |
| parent | 3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09 (diff) | |
| download | ffmpeg-02444f02f17d0ca059c19290788aa0fef2afac3a.tar.gz | |
Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'
* commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09':
mov: allocate the tag value dynamically
Conflicts:
libavformat/mov.c
See: f31445a82d6acd0b8fab5a26c04e91645f4854d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 73178c94c9..8d66c0afdd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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; } |