From patchwork Thu Mar 29 04:19:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 8217 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1233264jad; Wed, 28 Mar 2018 21:25:19 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+FL6WP6ba1nGEMzh7JIEnR2Zx/sWWMtHLdWerNTzOWWVyWa623Gma7eninV5jtbstDKHRT X-Received: by 10.28.232.200 with SMTP id f69mr4381947wmi.32.1522297519185; Wed, 28 Mar 2018 21:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522297519; cv=none; d=google.com; s=arc-20160816; b=skdY85KK9qsjF6RDT3FXYyvYsgiCMiirlbiqScvK4+JhUEq1F8sT+k6dtFDUlUfLS2 bOIw3GkiP9DHYxWh/7As4TF2zTGzF1wXzDvADFKIxN/ea8zB9+xsfvg5+EVq3jY9eJXn 49t8VDir98ZuDRcdI8phPQPBdnGswN66GCGCFLamZAZtjjMZzRhd7x9F0uy45S7PYrn3 s9z5nRQSU8sYUODWTyTBsX8xjBMSMxgCogZSjAp0SNCleGrA5+GvZm55H48QZMYQlv5g Dn2N0DBcfCmcm1Q62r9MoKTa7/MxRMVgVe74qCukLiz6ZkoARYknEiTBzkgH0P/TvDJB u/pg== 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=6B5G5wE38n4wibd3+eC75lGckUEehqF6KCnQQBzKmC8=; b=K0jpqgqusnJhU2eEiyXQFqWtHh5Z10fCScfl0qAGV6C/5uw5EpgO1Dnk6fEtxT9lqS YoTqx4mICOR999gTWnzf6ezLKCdvtJQ0SN5DUSWziuzeasSv7vL4+FyI3D3vaBez/bc8 kLBlciN4YH3YMF/wAvOC+rjTmJJh8lV/O035YSkoly0zbCL5MaPkS9bFQHG8JaNMFbn3 8HMmuPJaf09zcOlE/GfKcIGJ1F8K00toBZaVdNSNCIYzxf8JXcQQ+r2eN1lagdrLAzeX 4nBv/eX4voPabnec+yiNlePnqPvRPyvSzMmXGvhGBShOqVBMrp6DY3un2aId/p0Lp7qP gANg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MhH3Gaj+; 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 j50si3934452wra.202.2018.03.28.21.25.18; Wed, 28 Mar 2018 21:25:19 -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=MhH3Gaj+; 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 D188C689BAE; Thu, 29 Mar 2018 07:24:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E8706898D4 for ; Thu, 29 Mar 2018 07:24:51 +0300 (EEST) Received: by mail-it0-f68.google.com with SMTP id e98-v6so6262628itd.4 for ; Wed, 28 Mar 2018 21:25:09 -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=xhAhlZr4PGuMCRd/fD91OEhFz06qHH+zoJEIRUuKJcg=; b=MhH3Gaj+BbgEaW2LmZXnFw4EemaimTid1W8qML00tS8u2eOoBvTuyyff9l9hyFcE+3 xmDtfWq8RnFIpj2+kh96bwSMVdaEOMlu/oo6SxdUm6ZskLLy9bS3XV+CdJSqs1gY4B3k 0jOqbbKns77aILnQEg+fwfeLg/bmDb2Rf3bXc1tHWKgC/lGgbuLPrzaGvUh5occW1zTk MX/BpqiNHk9sDtXdcwDnYc1YoeHt+IOcijozwaZhHM8cbUcYavjsrDkAqXB1HGbaG7+p ODzV+PxFlH04M+vEhBEG1zyXrjhmpSVLfQvdTvOrBdRnmOMviiBy/cqxHbyqD/Ac7l2M pBLA== 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=xhAhlZr4PGuMCRd/fD91OEhFz06qHH+zoJEIRUuKJcg=; b=Zq8yRabH9EJ8QBHJ4NEFbpvXqIrqDGAh20Ky0vwxb0R0VgWCvHKUyUPNSTlXvjFsow j+SQy0zixqxgnrFVCGQA6fb4onvazE+Pdc6ORyEwlhZ5x6vRWclh76Afml/h1LHYIOlx QlYiqYN1dqd31Pv8W74CTrA143dY3amYWM+TX9FUy4ft1+qAisD0y5mVO7wFLeARA946 5ysy/G1QcG+6+yuphGnXMnoR0ZoFKP6HS5BpPB2TKn36M24/GHbv9iv0CjZXDcbcDyuz Dp/ihFiL6z7aI9CMlwI4lAHijuvwqpTIuTIsmIF8s1AFDrDAwOAGD6bHpOS/2c4dSVUV WUgA== X-Gm-Message-State: AElRT7HjyLkUL2OugclJ44gJkP6WdO8GNiuumkGSTePKu7qRLVIwzOb3 W+bx1fRxg/kasz/+w09qeQaO3/oX X-Received: by 2002:a24:2c48:: with SMTP id i69-v6mr5892267iti.86.1522297172044; Wed, 28 Mar 2018 21:19:32 -0700 (PDT) Received: from MacBook-Pro.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id i20sm3408680iod.36.2018.03.28.21.19.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Mar 2018 21:19:31 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Mar 2018 23:19:28 -0500 Message-Id: <20180329041928.59469-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] lavc/videotoolbox: fix failure to decode PAFF 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" --- libavcodec/videotoolbox.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index f82c31c5df..57b6698e1b 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -326,11 +326,8 @@ static int videotoolbox_set_frame(AVCodecContext *avctx, AVFrame *frame) CVPixelBufferRef *ref = (CVPixelBufferRef *)frame->buf[0]->data; - if (*ref) { - av_log(avctx, AV_LOG_ERROR, "videotoolbox: frame already set?\n"); - av_frame_unref(frame); - return AVERROR_EXTERNAL; - } + if (*ref) + CVPixelBufferRelease(*ref); *ref = vtctx->frame; vtctx->frame = NULL;