From patchwork Sun Mar 22 03:47:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18319 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 0197B44BCD9 for ; Sun, 22 Mar 2020 05:48:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D90B068B405; Sun, 22 Mar 2020 05:48:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D5C768B3AF for ; Sun, 22 Mar 2020 05:48:27 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id h6so12272068wrs.6 for ; Sat, 21 Mar 2020 20:48:27 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=LaF5pa1panXnGMzp/4oDSWLPXH4Gr5bhVUZDV9LPiYw=; b=IPwBc5WZphjhqi5Z3aJvpf+SXNggtFogI1+3wF45cnLOi+7n9v9MccJWBAcwiPzuvo W+aaECrpGHs8q33JdR6/P9JcHenqujviichvt37JlRQNPM6ku7o59a/rTyQujE0mkGI9 PtzdWqrTGP3xEZFpjXNBdBas8zgpopubvIC4zqIfchhiGRrR4Gf3QWdmsSfCQHk+xZO5 0fWAfqYe4X82DNwu8QjYZ5yiaCKT3RWQFqJEAOwJpMNZLsEFAbR+6Ngf66TDoWSEPvLv 437abdy6d/uWINlWkyHNg27KBta4CXe8W7MVATG4++2bEkzDdVQu6HtUUpwGrYKeXs6Z wcyQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=LaF5pa1panXnGMzp/4oDSWLPXH4Gr5bhVUZDV9LPiYw=; b=phkQvJ9YHbnosUjRjfNQvHYzY7uz/lhx8VB9BX/YNIiZi0U2K1FBFsqDAOBvcGRm3y jplDe2NMB7Py3mgBlzk7kb/RRj4NPEXePQlBI1ZO/0w7mw52ws7SQIVSRzR6N5dI68Wz mZea7+LdKrGxegOgZuFF8MgJkxVeSFt3HQ9G0AMHh/6OGdLWnFoYr3GXHieg0EXJLYdm STGHblZce2NHIQRFDvyTB4E7jY6z85d+/u3vWVEHS2WY2Fcy81DJVtLh/AUrt0QFGMyX xt5LfuDJbL+qRhCCkVlkkVrCizgf5CE2/ySC6QLhr4DsABsIZoTonvDE0F9D3Mw30Qdl 56ig== X-Gm-Message-State: ANhLgQ0pygUQY2N4FXa2WEhpihO0ULYc8J7kNxx2GjQh5aRfP67QD4iP PL+W9IsHyAB70ZjxURGwz4N+mRFw X-Google-Smtp-Source: ADFU+vtzeVaiZKjRv+itXOKRgZT11gJpRQQ4YYekarmvXyK3YRRn0TtPjsbR10Xunj3ti61PcQ42AA== X-Received: by 2002:a5d:6182:: with SMTP id j2mr3086678wru.131.1584848906251; Sat, 21 Mar 2020 20:48:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:37 +0100 Message-Id: <20200322034756.29907-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> References: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/21] avformat/yop: 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 return 0 after successfully reading a packet. Signed-off-by: Andreas Rheinhardt --- libavformat/yop.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/yop.c b/libavformat/yop.c index f9ead026a2..0d8d9f2ff7 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -125,14 +125,11 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt) yop->video_packet.stream_index = 1; if (yop->video_packet.data) { - *pkt = yop->video_packet; - yop->video_packet.data = NULL; - yop->video_packet.buf = NULL; - yop->video_packet.size = 0; + av_packet_move_ref(pkt, &yop->video_packet); pkt->data[0] = yop->odd_frame; pkt->flags |= AV_PKT_FLAG_KEY; yop->odd_frame ^= 1; - return pkt->size; + return 0; } ret = av_new_packet(&yop->video_packet, yop->frame_size - yop->audio_block_length); @@ -166,7 +163,7 @@ static int yop_read_packet(AVFormatContext *s, AVPacket *pkt) av_shrink_packet(&yop->video_packet, yop->palette_size + ret); // Arbitrarily return the audio data first - return yop->audio_block_length; + return 0; err_out: av_packet_unref(&yop->video_packet);