From patchwork Tue Dec 3 10:27:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16554 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3BC8144804F for ; Tue, 3 Dec 2019 12:34:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0F06C68AF0F; Tue, 3 Dec 2019 12:34:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06BFF68AE63 for ; Tue, 3 Dec 2019 12:34:11 +0200 (EET) Received: by mail-wr1-f52.google.com with SMTP id y17so2998654wrh.5 for ; Tue, 03 Dec 2019 02:34:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zvtuYEnmtw8U7otTtWYF2ftlGM15t17w02qDxwreHh0=; b=Pinem+qgJ8qlFMFEpG6MN0vJ3aoTS9WLdfTCxr2PeOkoKqMqoeQTRw/WRKMvxXgDCS 13pTLPuOJmEWYF5B1471keS2osX5m0fW7mhAsUjbFTcBfh/P4Q/+L08c8KpPV+JmFyYk jmeSueIo49bFlz/ysjZ6dZMZagoGOgDzdWB/0pxn39kdg7LfWJdz03fQuOpwDR1z/1o8 /aJBLHmI/r9hBebOIx+AMpCtl9O1W9J2y9fuyIqPockDdrvw3cf+iEM2yc9+rt2oDJh+ kE6iRtAJb+rGQhy0HCzmlUz+dRibDJVxyTVSfjRzrIH9D9U4riTOEQzwOIAGYLeDtvod SkGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zvtuYEnmtw8U7otTtWYF2ftlGM15t17w02qDxwreHh0=; b=OARiIzEtrPMEm70sNxYjekYOGp+cT6LrBuK9rwuBzVngLGK/HklyMFCH6PXsi5J+zB 0YpL7hN6i1ZzJMBZUn6AlwWvmatV83ugHcQIase2BH3GrSM/3pjar4auw0ITPS1N6qNN PS18IQMWUbYt8GA7/PgkQBPQuz/b3YPunzSY0MlIA6B50UoNTRkDmwD7mA3pvtTXzYIG sGp2KXo7RVweOOMi6c6nnqClOoPOLeq57DkrzvM9pKWRBRPgd39UthEYiTlGH6d9DriN NqkGOgYhdEboceq+nmxs1suYe2nUppo2bNh+YJHYoL0N7cgr7IHJYCZLEkqOgsKsYdwl hwMA== X-Gm-Message-State: APjAAAVJKpVBWL/BO1WG4vx6N1DhdrI4AXQQIPTHuQMpYERU1Fp/V6QA 5/SpX554jPVarovjZ8+YTEmvUKY0 X-Google-Smtp-Source: APXvYqwlSdIWf222jCx2Z2GB+wyjjuyrYRavYsdyyTQQb7HBXP+A98qtDsFi/J5p1ba9mJ4gvej0hw== X-Received: by 2002:adf:806e:: with SMTP id 101mr4483868wrk.300.1575368866084; Tue, 03 Dec 2019 02:27:46 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id 5sm2862992wrh.5.2019.12.03.02.27.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 02:27:45 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Dec 2019 11:27:38 +0100 Message-Id: <20191203102739.25613-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/hls: Use av_packet_move_ref() for packet ownership transfer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/hls.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 21353bbad7..f60396f246 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2201,9 +2201,8 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) ist = pls->ctx->streams[pls->pkt.stream_index]; st = pls->main_streams[pls->pkt.stream_index]; - *pkt = pls->pkt; + av_packet_move_ref(pkt, &pls->pkt); pkt->stream_index = st->index; - reset_packet(&c->playlists[minplaylist]->pkt); if (pkt->dts != AV_NOPTS_VALUE) c->cur_timestamp = av_rescale_q(pkt->dts,