diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-05 10:44:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-05 10:50:47 +0200 |
| commit | a7630e3755deb3d19469e6e05dd23690caf98eb8 (patch) | |
| tree | e0d98bea759f601c2066a3d5b0f1733f8abca212 | |
| parent | a927276fcc20c99f6e311fb9aa679d4ba1ba7e99 (diff) | |
| parent | b698542ad83284fbb8c22404e3cafeb2dd739d38 (diff) | |
| download | ffmpeg-a7630e3755deb3d19469e6e05dd23690caf98eb8.tar.gz | |
Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'
* commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38':
mov: Don't allocate arrays with av_malloc that will be realloced
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 37dd90b7ec..f222cf8452 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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; |