diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 10:54:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 11:23:40 +0200 |
| commit | cbe47b1e8452e37fda592941e7d3f3bb5920c201 (patch) | |
| tree | 9ea8b6418c4d89e27c98314d41974163b5dbafe8 /libavformat/mpegts.c | |
| parent | 64b6279d1414378214a58a55f0066fbc95256c9b (diff) | |
| parent | f369b9356c4606cd4d713d60f7db5de119d901fa (diff) | |
| download | ffmpeg-cbe47b1e8452e37fda592941e7d3f3bb5920c201.tar.gz | |
Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'
* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
avformat: Use av_reallocp_array() where suitable
Conflicts:
libavformat/asfenc.c
libavformat/gxfenc.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 2102bbed0b..37bb5d8d82 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -238,10 +238,10 @@ static void clear_programs(MpegTSContext *ts) static void add_pat_entry(MpegTSContext *ts, unsigned int programid) { struct Program *p; - void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(struct Program)); - if(!tmp) + if (av_reallocp_array(&ts->prg, ts->nb_prg + 1, sizeof(*ts->prg)) < 0) { + ts->nb_prg = 0; return; - ts->prg = tmp; + } p = &ts->prg[ts->nb_prg]; p->id = programid; p->nb_pids = 0; |