From patchwork Sat May 23 10:44:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19814 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 EFBB3449078 for ; Sat, 23 May 2020 13:44:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D3CA968980D; Sat, 23 May 2020 13:44:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E99A4687FCC for ; Sat, 23 May 2020 13:44:24 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id v19so5246813wmj.0 for ; Sat, 23 May 2020 03: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:mime-version :content-transfer-encoding; bh=UKgBb6XZwcakrcapxtwQ8Qi0mctoXtf+I8D5uRYm8w8=; b=H1t5EJ0AXmwXfGYQA95IjV/HEoSDvbLe3CU9bgSXvAAztZ+vIBivSlS9nv4LnoJ6sX qlgkOezL5BjRr1DahNECRcquN5OwA9tKpq/iz9LTVnfrn0J1O2qHygwYqdggTcIUc2cq R1gt2gGFLMoYlXIDdaYQ9sVN2fd1+OUwoLi9VkUeaeKP2zjxUR8jF3/ADIuc6qlcYMc6 zzvyzmP2i3DJJAdMPBa/uP9+Ur04hfazPIxDDiHdYKG8eDK2diEYOMSznKHTB4OBc4iJ yiyyMA3yDp+y8MQ3noJ/xVb8hf1+qcZ5X+LHbCGa87zhLueJKLR/8kKWlPBWLgUIEjIB Pc0Q== 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:mime-version :content-transfer-encoding; bh=UKgBb6XZwcakrcapxtwQ8Qi0mctoXtf+I8D5uRYm8w8=; b=NaXCeBXgfrO291gQnfvDlgtyg8lHA4AgAshfvnqOI1kQOl8PHOA1D1cQpXWHyNRkvQ d0hug2lupcBlF2JWqWOKmKj5PgZk2Py1ug8WFvAKSAEhz3uHgDws7l/A4V9F3KmfNiDV lz3AN3/SnKvmmuxIZhd89ZHcoYHUfi2NQmd5AFNVf6imvtR5OjEHdoZffr+vNo1GbFUg GarDk47b7IF2M2TvFGtz4gLfFrc9/hPykTOeUEDWTpwXDyBVgJizZ93gOV63uiuV+mdo xebPHKjXns+q886Ra2ZXFxCXdVM0N6eBtcbvPSDjhA24Ek/RR6kWB+GAneB35OPevxW0 nkOw== X-Gm-Message-State: AOAM533tNol+bPS1R7AkxuYT3LAQZWk1yyRl+VU/GT1zWwPmrX16c+lf K0HWM3ZM3R4n5bJYcGjjwex+NDHy X-Google-Smtp-Source: ABdhPJxoYfakoP31kJsnIZJPopy5Uq5JUbNXJ0XUqLpnkonabDaVEujv0kAx4vLz7Sav1wegwnrUew== X-Received: by 2002:a7b:cf22:: with SMTP id m2mr18158264wmg.82.1590230664144; Sat, 23 May 2020 03:44:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id r6sm15465455wmh.1.2020.05.23.03.44.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 03:44:23 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 May 2020 12:44:11 +0200 Message-Id: <20200523104413.10023-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/libopusenc: Don't free user-provided AVPacket 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/libopusenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 7c025a66d7..13017ac323 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -503,7 +503,6 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt, // Check if subtraction resulted in an overflow if ((discard_padding < opus->opts.packet_size) != (avpkt->duration > 0)) { av_packet_unref(avpkt); - av_free(avpkt); return AVERROR(EINVAL); } if (discard_padding > 0) { @@ -512,7 +511,6 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt, 10); if(!side_data) { av_packet_unref(avpkt); - av_free(avpkt); return AVERROR(ENOMEM); } AV_WL32(side_data + 4, discard_padding);