X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Faudiointerleave.c;h=922f4a5880fd8a8a487f1f2035ddba858c8a7330;hb=6e9081f4d87b4ebcd3355ebd560307c59d2104c3;hp=844112fcf576c323fa473f895e6dc474e22ba9f9;hpb=0489af478e5f490aee2d96daa29043b590c8d280;p=ffmpeg diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index 844112fcf57..922f4a5880f 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -113,10 +113,13 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt } av_fifo_generic_write(aic->fifo, pkt->data, pkt->size, NULL); } else { + int ret; // 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); + ret = ff_interleave_add_packet(s, pkt, compare_ts); + if (ret < 0) + return ret; } pkt = NULL; } @@ -125,8 +128,12 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt AVStream *st = s->streams[i]; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { AVPacket new_pkt; - while (ff_interleave_new_audio_packet(s, &new_pkt, i, flush)) - ff_interleave_add_packet(s, &new_pkt, compare_ts); + int ret; + while (ff_interleave_new_audio_packet(s, &new_pkt, i, flush)) { + ret = ff_interleave_add_packet(s, &new_pkt, compare_ts); + if (ret < 0) + return ret; + } } }