summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-15 14:11:57 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-15 14:13:17 +0100
commitfb37d03a870876b56ca1f2af26a5c423b0abcb6f (patch)
tree7bf75628288c47c629987d2320a5b6e2e56c3311 /libavformat
parent04cc753d0744ae25c2789b01597f041062378abd (diff)
parent2620df13104ddaa136158eb6bb1195adbf9d7692 (diff)
downloadffmpeg-streaming-fb37d03a870876b56ca1f2af26a5c423b0abcb6f.zip
ffmpeg-streaming-fb37d03a870876b56ca1f2af26a5c423b0abcb6f.tar.gz
Merge commit '2620df13104ddaa136158eb6bb1195adbf9d7692'
* commit '2620df13104ddaa136158eb6bb1195adbf9d7692': mov: Free an earlier allocated array if allocating a new one Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 4b684ce..413a508 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1913,6 +1913,7 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (entries >= UINT_MAX / sizeof(*sc->stts_data))
return -1;
+ av_free(sc->stts_data);
sc->stts_data = av_malloc(entries * sizeof(*sc->stts_data));
if (!sc->stts_data)
return AVERROR(ENOMEM);
OpenPOWER on IntegriCloud