From patchwork Mon Aug 6 00:34:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 9908 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp2687066jad; Sun, 5 Aug 2018 17:36:25 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdBPva1TU4nJndlpK+J6Iz9bwWEKsnuqzlRT0oD4m11uBMf3sWpTzKAAZ3ldBHynGfHoN8b X-Received: by 2002:a1c:b609:: with SMTP id g9-v6mr9611964wmf.73.1533515785596; Sun, 05 Aug 2018 17:36:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533515785; cv=none; d=google.com; s=arc-20160816; b=q5lRgNsGr0GD3usS4N1OcTz6KHX+vIvtyy+/qt0KlPCU8opN3YEaUTp8Rr9e6CnuEx 4Hc2EgUy1DB533OYxprx8pm9oQL6pq5ocBHxMboAOF45CIrMC3Xg4bDaGSl79TajrJOt 04wcbKKiKKd/b0yjEm+JRR8rjH+v46G7P+OaVQwK5FHH3Wx8f2MF+E6ftzaVi9efl/O8 rstn9pvjtTYalJIrNsvTxookvLJfz82H9Aug8d7rSyzKWfm51VQ5kxCrLTL5/S/yyu1n iaiss0mBK2iwEril/lQ+D4B1KEwc/XH3f/xN2woBEZ4oZEUkLZr/wvW6+lYIyDdQZb7P ic+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=wQQVfLsE5e7cUTSzF0GhQAlxifWFLFDQJlzEcslqc7k=; b=AQIYf7RIUYW1/sxOAPqb0awPP9VyiFoUoaMS7XkjUL6ct6kdC/OvRGeU9do2JUjuE9 uuXI0oJpbB3RAv5hZntjPbZ3QMRxFjS8mnvmELSDWU8rtvJZAFH8Pw7TUd2JIgEOcCbU M+72pGKzg7jBUuTmVsr/5vOOAH8ahAzjq3aoB7Q9NhB8PJILW72dPbdQMHhe07OkgyKJ JdNJ7n7ZKwaonUjgVPDK+z+P+Lef5kN24RW6OUffBvLZoJckypjgyEDo1TNi0dqmgrn/ pgpZCCVT8qRmMLUQ5moD0PMEDfcfXLWhJBATA544WJecuzhPk03w3aK2j7FLGZD9DrOs loJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ky1OObai; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x132-v6si4318535wmb.122.2018.08.05.17.36.24; Sun, 05 Aug 2018 17:36:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ky1OObai; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3043568A296; Mon, 6 Aug 2018 03:36:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14F1868A1FC for ; Mon, 6 Aug 2018 03:35:56 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id 191-v6so7748621qki.13 for ; Sun, 05 Aug 2018 17:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=HiCTV60RHcar3kmE1d1Asgg6xsj/4hh3xwMz6xLWSBc=; b=ky1OObainxeXAx0p3GNiC/4WONnSEz7v9uA+5Vnecn17xR5uWxHdx/ZF2+6G57TZn2 bYqJYh0Fueqv7YIrVaTilO1yQ+JoAYhCskSmpuUtykbgrnQJsOPzXNHPnioetzh+SbcQ soE0CAXID/TojbpBvjrwXN9tpfwg4HCkcv+/D7SzCBgimtO2OuvB21/dTaqZLd7whRQl qZgyBeih6sv5SK0PPgpOFsHGGuCy4bvmdhnk3LcXZucdHP8s4SpVaC47deGSsHJoAIdJ 6XMyFO4EMmTP+qVSwmIDZaB4tHFxHaNIGOXvJf/pk8dvPW11rDJjVXyhiJW/zr6rEfkN 7TGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=HiCTV60RHcar3kmE1d1Asgg6xsj/4hh3xwMz6xLWSBc=; b=R4yax1cCS8oY53JOfmpapNc+vX9luJqpV/LuqbcpqqTGawAwmgtKjkBXxQPyONxi/c og/hzjAEMnIpLMdUQ8t/rZrdObmvQjPXTAXdGG7XZYMqyvQwkhyPN39PomdTDZ4bMZtg PNlUS4UTH3GL+0VfIKB+EFanbRmeTVlVn7EBptOL6OOefoLVbWtbE7QAk0zHTnK9m11d hr7PY3q/TYZ7tIMDnrlcR9Zmjt/L324Th3gBoKUvO3Hy5kDgVxbHv7KybFvnGZJE193l tHgNmuu52KAj1ywWFPsoogP3G82OK6z/xRjbsYl89AlC4emtk3MCq9M7ntGYHb/4cm1e /Ngg== X-Gm-Message-State: AOUpUlFk7bsBp5zRlRN/MKAnSVYJs4juWNXjy1p8tMuVMOVjPk8TmlXz FNcEMBe/U/k90MLNiIuywveeCmAC X-Received: by 2002:a37:209:: with SMTP id 9-v6mr11653393qkc.267.1533515774628; Sun, 05 Aug 2018 17:36:14 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id z18-v6sm9828851qtz.89.2018.08.05.17.36.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 05 Aug 2018 17:36:14 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Aug 2018 21:34:14 -0300 Message-Id: <20180806003414.3436-1-jamrial@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: simplify refcounting packets for the muxing queue 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- fftools/ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 55faec8ede..2459374f08 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -724,11 +724,11 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u if (ret < 0) exit_program(1); } - ret = av_packet_ref(&tmp_pkt, pkt); + ret = av_packet_make_refcounted(pkt); if (ret < 0) exit_program(1); + av_packet_move_ref(&tmp_pkt, pkt); av_fifo_generic_write(ost->muxing_queue, &tmp_pkt, sizeof(tmp_pkt), NULL); - av_packet_unref(pkt); return; }