From patchwork Sun Feb 14 16:10:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25617 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 61BC444A6DF for ; Sun, 14 Feb 2021 18:10:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BA616898D2; Sun, 14 Feb 2021 18:10:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3A4B6808FC for ; Sun, 14 Feb 2021 18:10:27 +0200 (EET) Received: by mail-ej1-f48.google.com with SMTP id hs11so7419869ejc.1 for ; Sun, 14 Feb 2021 08:10:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=sXodP+q3KPvH+Q2xi5VUxls+l6zxBXCEoXiXC0fPoFY=; b=t8uFmQ8BHuaz/RT3snnCA8qVGIwxr04TIjOZ5pRQJbFNWiqFENTXbl0Epwq9OrGE0T gABJfR/0mP2cf/K/29W6XglPEryCi38PCrF9+VvjeCgB5kAFBn+CVDq+72VoRXHq0yrd VJamqLwaxB1UhxQq7c68j0yJDq6nCfjZSHTeaJGqc79XC9YlZY98SE2GLcArARhve3Dm yylP1p2ajEQiTi6fy5xwYkMSNlnzCQ6O3e41QZ6Yu/xu4TYD2W1f7tLNZTjJRAuB9+QB ZFlz+ZAUioZYDDBUym2An4KF+nfJsxZR7EbuOBSOoQvUbjlkBBrLDaWlD9JL06gnhqDc 0onQ== 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=sXodP+q3KPvH+Q2xi5VUxls+l6zxBXCEoXiXC0fPoFY=; b=eTN6Qt7lnV1zCeXvxR3dTPEzWEXL1yQfwujUhtlKddHIVmBhhOkXa7dPcofTuFFvyL VNMhlDXSpNF6Az3dkUPTcvaryArcOh+1Xx6rDwLBrzcAcUOi68GoErlBOsYNnOqmncmL wiFHnOKXWZ142/LroXM1drqcSnQXkHZqkWRZipt4se0ZDdyY077rG/y2OXWfsfbpHTz5 ykEj54k3iuhuHoTmwi3NGmGQO/skFdMIp4alZTAxrg6gkWVTBYwNeU9ag+FPaH/+DrMd lPhFyHkGqHF5/Otl7iIJEO1MRUR3dMAcvlkdAdz5SZLLJ7AuToRCJlLRgDMclL79Gjk4 AGCQ== X-Gm-Message-State: AOAM53230Hi6cN2g4xKC/CWO3EhHusErH0TCOjmBbfnkcVCpDx9EzQiB DBEWS4K+0NjuUm/ANz9caLGswDW9yZX33g== X-Google-Smtp-Source: ABdhPJz+2uCO7eWH4xz3GvJWgs5VHgwBmBhH16C5eEZWMi8iFxjbvnnn9S4cvuN2Oj901cC4kGCAUw== X-Received: by 2002:a17:906:5ac8:: with SMTP id x8mr12124662ejs.347.1613319027292; Sun, 14 Feb 2021 08:10:27 -0800 (PST) Received: from localhost.localdomain ([94.250.162.225]) by smtp.gmail.com with ESMTPSA id u17sm8791328edr.0.2021.02.14.08.10.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Feb 2021 08:10:26 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Feb 2021 17:10:19 +0100 Message-Id: <20210214161019.5002-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/pngdec: use correct frame for none disposition 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: Paul B Mahol --- libavcodec/pngdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 61642b7cbe..f0e2a0cad4 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1090,8 +1090,8 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s, // Do the disposal operation specified by the last frame on the frame + ff_thread_await_progress(&s->last_picture, INT_MAX, 0); if (s->last_dispose_op != APNG_DISPOSE_OP_PREVIOUS) { - ff_thread_await_progress(&s->last_picture, INT_MAX, 0); memcpy(buffer, s->last_picture.f->data[0], s->image_linesize * s->height); if (s->last_dispose_op == APNG_DISPOSE_OP_BACKGROUND) @@ -1101,8 +1101,7 @@ static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s, memcpy(s->previous_picture.f->data[0], buffer, s->image_linesize * s->height); ff_thread_report_progress(&s->previous_picture, INT_MAX, 0); } else { - ff_thread_await_progress(&s->previous_picture, INT_MAX, 0); - memcpy(buffer, s->previous_picture.f->data[0], s->image_linesize * s->height); + memcpy(buffer, s->last_picture.f->data[0], s->image_linesize * s->height); } // Perform blending