mirror of
https://github.com/nyanmisaka/ffmpeg-rockchip.git
synced 2026-01-24 07:31:22 +01:00
Merge commit '3cec81f4d4'
* commit '3cec81f4d4': mov: allocate the tag value dynamically Conflicts: libavformat/mov.c See:f31445a82dMerged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
02444f02f1
1 changed files with 0 additions and 1 deletions
|
|
@ -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…
Add table
Add a link
Reference in a new issue