From patchwork Tue Jun 26 21:36:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Rusak X-Patchwork-Id: 9517 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp98450jad; Tue, 26 Jun 2018 14:37:00 -0700 (PDT) X-Google-Smtp-Source: AAOMgpekUHANC+yg55Bpj92JKqk98u7MsmezptDKS5vMZ/fMfTHjx4FFZyrbsS1xVBC61alSRESz X-Received: by 2002:a1c:c74e:: with SMTP id x75-v6mr3091353wmf.93.1530049020136; Tue, 26 Jun 2018 14:37:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530049020; cv=none; d=google.com; s=arc-20160816; b=o1hGvq1NII2C1qbHBubw5+88I2p2KJgUVwqkagoe4bAc0pnZUOUMqz2f5ShcGYaSPp b4yIVVykQG8qUUm05qxRFmsP3Cybv+vycmYfScWEbLQRkioI3rLTaoDgJCTn0bez70Lk vMBqnXuSWpF51XMXQDcGwVL/HO6EFoUCVIj5/5+S99EA9cTDynmQ3PYyKUxx58pziAu+ oD9NkWmYOHVDEgPcRDJBNTkZYwrsKNOzD2JGgu4BIlNtwCnrQbnHNMeBB9DjgS68QYxJ 6ZDBas3/cumcNDw0c6+ydrk+P5B2CyA1hatwnMTPF10miYV2Ha4QpOtr8Ya9igoLHZOc YW9A== 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=7l+oNf58AL6dcriA47aCA3HUpBMlYLbrQiwZA4UeUTs=; b=NU4FY/XGG2stsCBWuwBUDqwc1wtbgU78147JYp/nzBmYhD1nkwf7/jrlfJsfAWEy33 8UsqMu+dhuNBiSXj3aOEZDokQZ5ysr/FSwijetpk03wh0gNHaI3/9RIUw1e6jddRyBu4 S1hiBCM+coz4NUg6uIIHQyQmSwNycJRqrNBntkKcu4LR/b7WtBlA/EIIuvFqhgugOZe7 vUdQTU53rryOI1v/uKNnN4FdU2MoMwkayZcTsh77mi58Qww4ZYVNLl7Xfu0ZlSjoFaTE MD+aoLkfjwZEVCDn/BHUKpw4C1u33n3tSkpxnhJVTTo/Hzm/bAzqJcuMN2qHbLwUVrJX 2hPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=COyW7uUw; 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 v124-v6si1756464wmb.55.2018.06.26.14.36.59; Tue, 26 Jun 2018 14:37:00 -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=COyW7uUw; 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 9BC6C68A3A6; Wed, 27 Jun 2018 00:36:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A52D68A28B for ; Wed, 27 Jun 2018 00:35:54 +0300 (EEST) Received: by mail-pf0-f174.google.com with SMTP id j17-v6so26880pfn.5 for ; Tue, 26 Jun 2018 14:36:50 -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=kQOBIECTyg+DBjfcpqZCEQNqf5qn6GOY8aMnVyS+1eI=; b=COyW7uUwX6JxS45mAuaa3w4IUQX+85YqGg8z003N6gJ3ywycnRf11xsEQNAtCH9wx6 DzpueVQ/+mmWOoXmW8XX3z2LpB9LFH76sLJt+81LTm4es5gVp1aNxx1zHHAms11XkeAE j/vzGM/7Ap67AUd0p/8/4aTcvCkx6n9nVcxK8LV2oiJoY0LVWYWaBT9mSMmZVBZ0fO3Z JH2F9fPodZa722t66Ap8klJHqrzqgRYNMaUiaNXL9BhQIRoQtroVvvgpu0BmUEeYS1Hg 1FgBNFo+emoSREqxyiQ1DIfujW8WfHXRkNYDppA2szfwuLhnO5Ge7IOIUgrMzt/on8ej Es7w== 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=kQOBIECTyg+DBjfcpqZCEQNqf5qn6GOY8aMnVyS+1eI=; b=DY+aEDIecuxWjQ5AkQYKvLnu2NyPW3Fs3fTlvkVAld1lY/gQNgmnN+M5z79woWhgiV ByIYWgKoLGgoazKdqn+jC5+aVsQbgzP4rChd6SPWAVhxdnYnTAP6C5TFsYm/+dHdr0Cz u6SCpoWVB6iTVlAtQ9tWq+dei3V00TR53oYqTPvYxurjjRV0shXHvmQCt/E2OEWlCfEK gu0ejvuaaoPRzfzBYagA7m4FylrsSOcWKMIgYhWGdCsbwOjjGrSNrDzSTBjywVW2ncwj fsUbacJgDMAEPmzI/UaVcx5dIlgll0QifCzIROPpovU1pDC/EOFRX8w7zA9stDlFoOm2 Z3EA== X-Gm-Message-State: APt69E3xwUbtNOuo54T3ZO3T5i463WmQ9J0U8GL9uizhpXQ7UkS11EGW 6pCbinVAzOv6ck25ZPd5BqdEBQAa X-Received: by 2002:a65:6008:: with SMTP id m8-v6mr2818494pgu.134.1530049008623; Tue, 26 Jun 2018 14:36:48 -0700 (PDT) Received: from localhost.localdomain (d154-20-200-72.bchsia.telus.net. [154.20.200.72]) by smtp.gmail.com with ESMTPSA id m11-v6sm7137425pgt.46.2018.06.26.14.36.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 14:36:47 -0700 (PDT) From: Lukas Rusak To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Jun 2018 14:36:46 -0700 Message-Id: <20180626213646.20495-1-lorusak@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] libavcodec: v4l2m2m: make sure to unref avpkt 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" This was found using valgrind. Using this patch there is no more memleak present. --- libavcodec/v4l2_m2m_dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index 598dc10781..710e40efd8 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -149,11 +149,14 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) if (avpkt.size) { ret = v4l2_try_start(avctx); - if (ret) + if (ret) { + av_packet_unref(&avpkt); return 0; + } } dequeue: + av_packet_unref(&avpkt); return ff_v4l2_context_dequeue_frame(capture, frame); }