From patchwork Wed Feb 3 10:27:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25367 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 390A844B1BB for ; Wed, 3 Feb 2021 12:29:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26A9868A326; Wed, 3 Feb 2021 12:29:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4034D68A558 for ; Wed, 3 Feb 2021 12:29:22 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id sa23so18517992ejb.0 for ; Wed, 03 Feb 2021 02:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GZu3iLuUssrWxby53H4cmbjxONe7tsegnanJuqG89W8=; b=V1ooG053eNSBTBN4AwFT3B9BzQCcGLIpN0uHJRtVrzvheiLvjJuGlLlS5ELdb3JQET pAMKoT3lCJARtEEfy9AVlCCVmAnyWmb3OSww1kk2ETBPiODxRAP26mMdfrTK/umUP/UQ nC8XdIl11nGCzCfu1lyvv1y0Uzvpg+No9BItX1vxr1i/7TOROXlUdn7qZqVvePy+Qvqb Ry+hEyH+6dzFLbCjx4FPpsXHshPCaOwH6WNIczdUv4YeZuBeb5acZtQOuEjnP0BWMge2 HkZWPSpztMeyk/4AsYDbztg/Z8Yi0DaLb1L/XYT2n1rlCr4C0NnZkGTLk8gprBlrUxp1 SgPA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=GZu3iLuUssrWxby53H4cmbjxONe7tsegnanJuqG89W8=; b=B9ZjlVXKOgNFQMDhEhbrlEgZxeC4LkrAUH25Io5K6zwIZVviigJh8Y1Fa+V7/aN4yE wF/fMMlTmrsl+eUJdiqjNU2AsPbu8mkbdQtuL5JwhbmzFcRq/Ej5FFrppr2RZGbTFwpo nZ5GtqjrZQeRoBqwNV50R9ixjElGgii/reP6W/Nzt0F163woguH8vpPsXcUVGS/ZbsUq 6+e3k0mQQucv4R4JF8a7TlMz0ayGP+d1WUNem2IlUhd9IpYZygaQzuozt8nlSXhMx5nq eTmIwkiXfX9lVSEDadFTXH2exV99qbNKTxssF9ewINqz5UOQFuULPuzE4qRrkusjZnSt sVjw== X-Gm-Message-State: AOAM533kfYnNzSdI4rn7ef26CPAH3PyuI2GlTPbQhJHnWEiS4P1It4Nd /IYbeMWWyHTa2//SlS0Raqt2Bx8NEz8= X-Google-Smtp-Source: ABdhPJzGNy/PlldmjHXRoeht5ZAEx0Yv6U1iuKD6jYIWfSHX6GOYa8O/cW8GXl2lcCyISaUwPR/ikQ== X-Received: by 2002:a17:906:6951:: with SMTP id c17mr2448416ejs.395.1612348161473; Wed, 03 Feb 2021 02:29:21 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id y11sm804041ejd.72.2021.02.03.02.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 02:29:20 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 11:27:48 +0100 Message-Id: <20210203102749.473999-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210203102749.473999-1-andreas.rheinhardt@gmail.com> References: <20210203102749.473999-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/ilbc: Use av_get_packet 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 --- libavformat/ilbc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c index 188c0f091a..bee3954f9c 100644 --- a/libavformat/ilbc.c +++ b/libavformat/ilbc.c @@ -99,15 +99,11 @@ static int ilbc_read_packet(AVFormatContext *s, AVCodecParameters *par = s->streams[0]->codecpar; int ret; - if ((ret = av_new_packet(pkt, par->block_align)) < 0) - return ret; + if ((ret = av_get_packet(s->pb, pkt, par->block_align)) != par->block_align) + return ret < 0 ? ret : AVERROR_INVALIDDATA; pkt->stream_index = 0; - pkt->pos = avio_tell(s->pb); pkt->duration = par->block_align == 38 ? 160 : 240; - if ((ret = avio_read(s->pb, pkt->data, par->block_align)) != par->block_align) { - return ret < 0 ? ret : AVERROR(EIO); - } return 0; }