diff options
| -rw-r--r-- | libavformat/audiointerleave.c | 8 | ||||
| -rw-r--r-- | libavformat/internal.h | 4 | ||||
| -rw-r--r-- | libavformat/mux.c | 20 |
3 files changed, 22 insertions, 10 deletions
diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index e4cde9d0aa..e49c77fe0b 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -99,7 +99,7 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int), int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *)) { - int i; + int i, ret; if (pkt) { AVStream *st = s->streams[pkt->stream_index]; @@ -116,7 +116,8 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt // rewrite pts and dts to be decoded time line position pkt->pts = pkt->dts = aic->dts; aic->dts += pkt->duration; - ff_interleave_add_packet(s, pkt, compare_ts); + if ((ret = ff_interleave_add_packet(s, pkt, compare_ts)) < 0) + return ret; } pkt = NULL; } @@ -126,7 +127,8 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { AVPacket new_pkt; while (interleave_new_audio_packet(s, &new_pkt, i, flush)) - ff_interleave_add_packet(s, &new_pkt, compare_ts); + if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0) + return ret; } } diff --git a/libavformat/internal.h b/libavformat/internal.h index 0e7eb36e32..2824436286 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -87,8 +87,8 @@ void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int i * Add packet to AVFormatContext->packet_buffer list, determining its * interleaved position using compare() function argument. */ -void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, - int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)); +int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, + int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)); void ff_read_frame_flush(AVFormatContext *s); diff --git a/libavformat/mux.c b/libavformat/mux.c index 9c2144acc1..df4f57a7f3 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -384,12 +384,15 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return ret; } -void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, - int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)) +int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, + int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)) { + int ret; AVPacketList **next_point, *this_pktl; this_pktl = av_mallocz(sizeof(AVPacketList)); + if (!this_pktl) + return AVERROR(ENOMEM); this_pktl->pkt = *pkt; #if FF_API_DESTRUCT_PACKET FF_DISABLE_DEPRECATION_WARNINGS @@ -397,7 +400,11 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif pkt->buf = NULL; - av_dup_packet(&this_pktl->pkt); // duplicate the packet if it uses non-alloced memory + // Duplicate the packet if it uses non-allocated memory + if ((ret = av_dup_packet(&this_pktl->pkt)) < 0) { + av_free(this_pktl); + return ret; + } if (s->streams[pkt->stream_index]->last_in_packet_buffer) { next_point = &(s->streams[pkt->stream_index]->last_in_packet_buffer->next); @@ -422,6 +429,8 @@ next_non_null: s->streams[pkt->stream_index]->last_in_packet_buffer = *next_point = this_pktl; + + return 0; } static int interleave_compare_dts(AVFormatContext *s, AVPacket *next, @@ -442,10 +451,11 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, { AVPacketList *pktl; int stream_count = 0; - int i; + int i, ret; if (pkt) { - ff_interleave_add_packet(s, pkt, interleave_compare_dts); + if ((ret = ff_interleave_add_packet(s, pkt, interleave_compare_dts)) < 0) + return ret; } if (s->max_interleave_delta > 0 && s->packet_buffer && !flush) { |