Commit a7630e37 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b698542a'

* commit 'b698542a':
  mov: Don't allocate arrays with av_malloc that will be realloced
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a927276f b698542a
......@@ -2653,7 +2653,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (!sc->ctts_count && sc->sample_count)
{
/* Complement ctts table if moov atom doesn't have ctts atom. */
ctts_data = av_malloc(sizeof(*sc->ctts_data));
ctts_data = av_realloc(NULL, sizeof(*sc->ctts_data));
if (!ctts_data)
return AVERROR(ENOMEM);
sc->ctts_data = ctts_data;
......
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