From patchwork Sun Mar 22 03:47:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18318 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 D349C44BCD9 for ; Sun, 22 Mar 2020 05:48:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFFA168AF7F; Sun, 22 Mar 2020 05:48:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A916268A82D for ; Sun, 22 Mar 2020 05:48:09 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id 31so6282343wrs.3 for ; Sat, 21 Mar 2020 20:48:09 -0700 (PDT) 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=HbxMhMgIgQ0g4GBPeWtL8Jmav598XJumLzBdqy9bdQ8=; b=JgBiCU3Va7yDab5YXPDhnfrwO/caUEL3lnQoIHgdWOEY8Uhw2McptFDGkC7aDkywy0 WjCpgvHDTJtxYTnVVQn+zQp/QfVCGwT8D8Spzm2HcbGoqvn2EleKtXD6ql940A29phsf /eiemdQVpjg9n99+ndR521zqVE/ioNxHhziuh+h9Ak2I9QBVKR4UgCQDhrwc/Reva4Y0 V8JDhilRQFt6XJiNpfCRRDv5fYmVBU9cx4a4mQDCQdMefmzWl5Xb9AJ4yUN/UKy9zlLW CP+26lftctrPJ1fhJHObU6ND7VUKU1YIFT2vErAnmqq8uUSrNwX6gwPwaQI40f5lGf4i c+yQ== 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=HbxMhMgIgQ0g4GBPeWtL8Jmav598XJumLzBdqy9bdQ8=; b=rHhmrojddtsuu5M+axNDKtnnJJKpoiygF1miLnhCD7njRiS35+QuLZ52QM01Xy+Jqf rJI8uQztjkjTblw2E5jwq4kFaqiqHlkkSmUM6D34oDK10hBP8tVchZrz79caMpBvkjhX ojAe9TBQO8UMjCgcVGhr1xMyNDE15iKY2Y3siadoPAr7BQdWqeaawWtaoI/6aOpQ+eKj /cuqit34b83knAqNGOthjN/X00Vu91wPmdifEzGLuiVgwmurTU55JHwCkz8BHMrN5oxv zxbx8RyEazaxMw8rFWftCeNQ4v7/jvWLM49ZPaZJpPYZoNzjFSf63jcmNnCFzMCcyAsm GgNQ== X-Gm-Message-State: ANhLgQ3mv0I/o2t9GQbT4fVjcgmWzsIENZDCl6774aaGrd1mLJCSMslv sQTX/cMy/FeR5GCpcoyJqcND3VB7 X-Google-Smtp-Source: ADFU+vuyp+l6rF6XRmZk+T2A4tWPvurwVW+2bXKbaeAYIw+0Zf1je6tyIY70J25lgyYI3ip0BwMwkA== X-Received: by 2002:a5d:440a:: with SMTP id z10mr21262119wrq.177.1584848888513; Sat, 21 Mar 2020 20:48:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k204sm1530371wma.17.2020.03.21.20.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:07 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:36 +0100 Message-Id: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/21] avformat/nsvdec: 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" Also simply return 0 in case a packet has been successfully read. Signed-off-by: Andreas Rheinhardt --- libavformat/nsvdec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index b5d9313778..eb26b29450 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -662,10 +662,8 @@ static int nsv_read_packet(AVFormatContext *s, AVPacket *pkt) /* now pick one of the plates */ for (i = 0; i < 2; i++) { if (nsv->ahead[i].data) { - /* avoid the cost of new_packet + memcpy(->data) */ - memcpy(pkt, &nsv->ahead[i], sizeof(AVPacket)); - nsv->ahead[i].data = NULL; /* we ate that one */ - return pkt->size; + av_packet_move_ref(pkt, &nsv->ahead[i]); + return 0; } }