From patchwork Sun May 17 23:13:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19727 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 4549B44B362 for ; Mon, 18 May 2020 02:20:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 114406898F7; Mon, 18 May 2020 02:20:51 +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 6A421680280 for ; Mon, 18 May 2020 02:20:44 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id f13so7468006wmc.5 for ; Sun, 17 May 2020 16:20:44 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=vC0Iy8+J0WoYEbH4BPpcTxMB6Rt8Qi8MrJPL+KsFuzg=; b=GlhdFFOabm/OWE2vJb1cGoRHMkYbzwVzeC9VlJ+5eN78vz04nVktDF+VJm7yE6vSDJ 0JISmYRccAD652ftGwMWGZnJugCA9yzyFD8BySrfaIhEnEqzw21412n8qpIW8seunKct KFpMvSizZtPaGoO0QHQyDnzfeGGYRWazaoyJPfnogVtbOQGDsl3itzAhq0ywuDMjaZlv DPeaR8bhuKrvrLBLdh6I8U9BMvBhUWx5QsR5Xfg0TRk1CT3/QBjoA5iz22ACAoXA5K5s 3z5WJexLL9vS/HdQw+tBS4b7gRiNLNii0nLPPYP7xu2v//AqATnmPzH4fZ4KADLpH2BZ l8aQ== 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=vC0Iy8+J0WoYEbH4BPpcTxMB6Rt8Qi8MrJPL+KsFuzg=; b=dcS3K8XeMLq3kdwnQM9I40Bmn/g+kViMBx0QbVRp8auVb6Kxa8ap7xPPI1CwWpRyUv txgGi2lMjeMjr3evg16Xf0YrXysr/ixcwivkGWrfLvqT1sHZdi0/168gIVYDfprNf9zG RS778pJs/v6runiJXqZgGfXxRmtkQKXodJNHLtNpuAAVCJwLiGBEFjaesNs+DcIQcORb vKl0dpmOjg+xlxtdhk+uuXP8DbCfhEm1s9+b4S2r6gKIFP+XtriW+PgLclbAPHfu0fm0 2bC51YNU9TGqM6y9ArfZuWgeMihRE3wii/iGA2KKLwsqskM8yv9XmlO0GRXG1iQC4O8d Hhog== X-Gm-Message-State: AOAM5300GfWg1YiaUsiAVQjBJTSng75Jjy0t8N4FpEzpDOUzI1gD91A8 W5Z2Fcef00VEaVSzpjNgqxqKBQXT X-Google-Smtp-Source: ABdhPJys0JVNdIW6X21dApnm/23OWaf59T5T9KjN46FDGj/mY9WPLRiE6vbZ/mSVSelj7b6RHOv5Yg== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr16982379wmg.161.1589757229426; Sun, 17 May 2020 16:13:49 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:16 +0200 Message-Id: <20200517231319.13067-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] avformat/matroskaenc: Forward errors from avpriv_split_xiph_headers() 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/matroskaenc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 99b549ecc4..1b6e80da36 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -603,17 +603,18 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, const uint8_t *header_start[3]; int header_len[3]; int first_header_size; - int j; + int err, j; if (par->codec_id == AV_CODEC_ID_VORBIS) first_header_size = 30; else first_header_size = 42; - if (avpriv_split_xiph_headers(par->extradata, par->extradata_size, - first_header_size, header_start, header_len) < 0) { + err = avpriv_split_xiph_headers(par->extradata, par->extradata_size, + first_header_size, header_start, header_len); + if (err < 0) { av_log(s, AV_LOG_ERROR, "Extradata corrupt.\n"); - return -1; + return err; } avio_w8(pb, 2); // number packets - 1