diff options
Diffstat (limited to 'libavformat/movenchint.c')
| -rw-r--r-- | libavformat/movenchint.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c index 58ad9e4c0a..964026ec71 100644 --- a/libavformat/movenchint.c +++ b/libavformat/movenchint.c @@ -2,20 +2,20 @@ * MOV, 3GP, MP4 muxer RTP hinting * Copyright (c) 2010 Martin Storsjo * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -72,7 +72,7 @@ static void sample_queue_pop(HintSampleQueue *queue) if (queue->len <= 0) return; if (queue->samples[0].own_data) - av_free(queue->samples[0].data); + av_freep(&queue->samples[0].data); queue->len--; memmove(queue->samples, queue->samples + 1, sizeof(HintSample)*queue->len); } @@ -85,7 +85,7 @@ static void sample_queue_free(HintSampleQueue *queue) int i; for (i = 0; i < queue->len; i++) if (queue->samples[i].own_data) - av_free(queue->samples[i].data); + av_freep(&queue->samples[i].data); av_freep(&queue->samples); queue->len = 0; queue->size = 0; @@ -104,11 +104,12 @@ static void sample_queue_push(HintSampleQueue *queue, uint8_t *data, int size, if (size <= 14) return; if (!queue->samples || queue->len >= queue->size) { - queue->size += 10; - if (av_reallocp(&queue->samples, sizeof(*queue->samples) * queue->size) < 0) { - queue->len = queue->size = 0; + HintSample *samples; + samples = av_realloc_array(queue->samples, queue->size + 10, sizeof(HintSample)); + if (!samples) return; - } + queue->size += 10; + queue->samples = samples; } queue->samples[queue->len].data = data; queue->samples[queue->len].size = size; @@ -421,7 +422,7 @@ int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, sample_queue_push(&trk->sample_queue, pkt->data, pkt->size, sample); /* Feed the packet to the RTP muxer */ - ff_write_chained(rtp_ctx, 0, pkt, s); + ff_write_chained(rtp_ctx, 0, pkt, s, 0); /* Fetch the output from the RTP muxer, open a new output buffer * for next time. */ |