X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fttaenc.c;h=d8e1136ead1a2ed7debc33ce1f5cba0aa8a39eb0;hb=9a88a47be4da9cd25a582feec7cc36790500b481;hp=add15873d048fffc647d9fd88581550a1b239974;hpb=1325ac4c93f27dd56ebce37d8045d7ceb64dc645;p=ffmpeg diff --git a/libavformat/ttaenc.c b/libavformat/ttaenc.c index add15873d04..d8e1136ead1 100644 --- a/libavformat/ttaenc.c +++ b/libavformat/ttaenc.c @@ -91,22 +91,13 @@ static int tta_write_header(AVFormatContext *s) static int tta_write_packet(AVFormatContext *s, AVPacket *pkt) { TTAMuxContext *tta = s->priv_data; - AVPacketList *pktl = av_mallocz(sizeof(*pktl)); int ret; - if (!pktl) - return AVERROR(ENOMEM); - - ret = av_packet_ref(&pktl->pkt, pkt); + ret = ff_packet_list_put(&tta->queue, &tta->queue_end, pkt, + FF_PACKETLIST_FLAG_REF_PACKET); if (ret < 0) { - av_free(pktl); return ret; } - if (tta->queue_end) - tta->queue_end->next = pktl; - else - tta->queue = pktl; - tta->queue_end = pktl; avio_wl32(tta->seek_table, pkt->size); tta->nb_samples += pkt->duration; @@ -131,16 +122,13 @@ static int tta_write_packet(AVFormatContext *s, AVPacket *pkt) static void tta_queue_flush(AVFormatContext *s) { TTAMuxContext *tta = s->priv_data; - AVPacketList *pktl; - - while (pktl = tta->queue) { - AVPacket *pkt = &pktl->pkt; - avio_write(s->pb, pkt->data, pkt->size); - av_packet_unref(pkt); - tta->queue = pktl->next; - av_free(pktl); + AVPacket pkt; + + while (tta->queue) { + ff_packet_list_get(&tta->queue, &tta->queue_end, &pkt); + avio_write(s->pb, pkt.data, pkt.size); + av_packet_unref(&pkt); } - tta->queue_end = NULL; } static int tta_write_trailer(AVFormatContext *s)