From patchwork Mon Sep 28 18:44:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22651 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 2D20344B4DA for ; Mon, 28 Sep 2020 21:44:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01334687F85; Mon, 28 Sep 2020 21:44:29 +0300 (EEST) 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 1EE7B680951 for ; Mon, 28 Sep 2020 21:44:24 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id k18so2170106wmj.5 for ; Mon, 28 Sep 2020 11:44:24 -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:reply-to:mime-version :content-transfer-encoding; bh=4fI0d0NdIP33qt0CJWFc7Rc38Ti33ITWeaoAmHOfeA0=; b=iVxosgr0Tp+x9jnLCtHStPNLAyzIROuBw6uIbSz4YbHB521/X2ykwvk2JiLkUt0BzT OjWYTAcZaLt70mTf2eEmw8R6yd5dSeVuN/+1tI7eAPgNhoEHvp8T5CDkcnOSlj8wNc/Q 87o+a47n48DJB1nGELPRImLjN/HPW66iIluVt+6SSqqbhRb8mYv5pKDmNFpJ4SO7cOlc hkWx+GEueIHKNtz5sjsyCS4a5280Z1DEjSxuSr4/B+GMe0H7kStvWL4gpTczh6+We7BS o28xoCP1MD+fJib6C7jXBYLcv6RDA8jxSuhb5QsEsoHTiWuFPZKwcXyIuXB9BBvGwEMi n0JA== 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:reply-to :mime-version:content-transfer-encoding; bh=4fI0d0NdIP33qt0CJWFc7Rc38Ti33ITWeaoAmHOfeA0=; b=N4DhppbaIhVLtZ9ZpXTHwC9TQNsiYCsqOn7D+j8KtFp2iHsmrpe8lxz0nWMI+2IMYQ VvZvbHcB4MuAS7Z1q9na2KN4hXWj972cPQMFzpOJd/5/gTMX1F3ixqPZEmttgnLE6oY6 TZ23As0109cvm+iZLL1PQFY2/Thpz12q/pCMAChXyMS9kPDutl/kxB7b6YMShqdfo528 K8JEXKQPDjYVBTZADiuClA5t19HDvVRKZrIvIIvoFSbkXS/0RDpI5qYo8Ql/M+y3dOXs WS7amVxh8bWX9uMPviY8J/RAkHTuxAdOsS3vDCEqcpeD3WdcvixnfdtKRJRW7BY1qT/a 9BTw== X-Gm-Message-State: AOAM531HcAY2H3LaOUrC+A5gSC1jXGr+FvPQkyfQ/k5YZEWJVdL8S1qb jDqw615EgTTzWiPMTEIK1JJyG8cApd0= X-Google-Smtp-Source: ABdhPJwDHRk+H4b/vP3c4J+RIkicrTYisEwyX/DLJolYa1jTg7BtfnVY8P+2yhLHrDMeuD24W2Ppew== X-Received: by 2002:a7b:c182:: with SMTP id y2mr548557wmi.21.1601318663402; Mon, 28 Sep 2020 11:44:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id y6sm2499802wrn.41.2020.09.28.11.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 11:44:22 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Sep 2020 20:44:13 +0200 Message-Id: <20200928184413.703410-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/qsv: Fix leak of options on error 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 --- libavcodec/qsv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 7816d2f93c..6e3154e1a3 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -361,6 +361,7 @@ static int ff_qsv_set_display_handle(AVCodecContext *avctx, QSVSession *qs) av_dict_set(&child_device_opts, "driver", "iHD", 0); ret = av_hwdevice_ctx_create(&qs->va_device_ref, AV_HWDEVICE_TYPE_VAAPI, NULL, child_device_opts, 0); + av_dict_free(&child_device_opts); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to create a VAAPI device.\n"); return ret; @@ -375,8 +376,6 @@ static int ff_qsv_set_display_handle(AVCodecContext *avctx, QSVSession *qs) } } - av_dict_free(&child_device_opts); - return 0; } #endif //AVCODEC_QSV_LINUX_SESSION_HANDLE