From patchwork Tue Dec 3 10:28:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16555 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 70A2744994C for ; Tue, 3 Dec 2019 12:35:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5464E68B14D; Tue, 3 Dec 2019 12:35:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 477F768B00D for ; Tue, 3 Dec 2019 12:35:35 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id p17so2879558wma.1 for ; Tue, 03 Dec 2019 02:35:35 -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=UL5AH4mCXDE4NZi3u0m93sPxGi8hKCJoCbL1mXHyTC8=; b=PxSvJQNk6vmjqyhk3dghninVOhqtXrPPNP15tBMoskZiiYZ8ATIS++C7NUpMjPlDws Uo1NlHoo5MfZcqTHQlYI137dbB/mJfpkFQ37CnmkowbVZJu0kezigQAdpW7O8fyW+cKp cBfqmgL1APK4yPLkRYAep6VfB52t80ngP90ERwgks/JXp6f2WwGrkMS5DsQPQuSoGMos FrwTWYjKz4rUtDUb0ycQv7ne1GMPUvqqIvdoilv+/dM3sSsuF+d8YmkTi0jEgHLGoMCq ZCrgY/x0X+J/eej3vm9IU/V6mxuNXXr/j3oU+rYa7Mh6V+9Si3fKpRuKGLz7IC7vzT8z K4pg== 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=UL5AH4mCXDE4NZi3u0m93sPxGi8hKCJoCbL1mXHyTC8=; b=s4xSw1jRGvWjJeQwgBV8c6JEutvAgexvT5W25RH/ldIMCXftKPWkCZJyLrQ0P5e25U M/kRRBidV/CLrFPYWomYscQzmVLm7Y5FNs3ksShFa5IxY6clZmi/222RTNxCsu+Flds+ t061rpZCL+fjk04nzyznETdbaV9Mx8jJ7wBQMaAOYiC3KfuHhRz3fqDD8yEjUzId4EC1 MDvqdl2Ng++kvvU/VWEn1GvhxPn3q8L38YQS/1cW5Jk9oE3xFuJLgY6d2/M2rWNTgGai s7cNkvJ5NDgAr+eG4ZIC2v48Mfu4vTX1dBFxCrogVdwbZtyoe6cSh/AkosZZ3LUXGn5N 2z/Q== X-Gm-Message-State: APjAAAURB/j6mcuhr8fkFBdjSckZEKgZax1BAbQ6rLIAvkAjHuIXzCvf a/5qihK/HYqT/CBYy1w/ql2QjfaE X-Google-Smtp-Source: APXvYqxpke+CbyILOoAzvKiXUqBX39n9nmN5WcHrvgi0FSfCXhBwawyqERKsRFhjOIPwAsNvEXMp7g== X-Received: by 2002:a1c:5419:: with SMTP id i25mr5180140wmb.150.1575368949243; Tue, 03 Dec 2019 02:29:09 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id q15sm3053149wrr.11.2019.12.03.02.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 02:29:08 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Dec 2019 11:28:07 +0100 Message-Id: <20191203102807.25665-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/rmdec: 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/rmdec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index e612c42e57..2c40b866aa 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -836,10 +836,7 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb, if (type == 2 || vst->videobufpos == vst->videobufsize) { vst->pkt.data[0] = vst->cur_slice-1; - *pkt= vst->pkt; - vst->pkt.data= NULL; - vst->pkt.size= 0; - vst->pkt.buf = NULL; + av_packet_move_ref(pkt, &vst->pkt); if(vst->slices != vst->cur_slice) //FIXME find out how to set slices correct from the begin memmove(pkt->data + 1 + 8*vst->cur_slice, pkt->data + 1 + 8*vst->slices, vst->videobufpos - 1 - 8*vst->slices);