From patchwork Thu May 7 19:19:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19538 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 7035A44A07C for ; Thu, 7 May 2020 22:19:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E97668A76C; Thu, 7 May 2020 22:19:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14344689E33 for ; Thu, 7 May 2020 22:19:45 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id y4so7721520wrm.11 for ; Thu, 07 May 2020 12:19:45 -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=TqAPTojSueVJu377Drq2kQO9o9J4y+PAgGpCBaB/JBU=; b=ZWAdAdXMXskSgcM3rW6qIaRL5SK4ocbNunBBZ/o0FB1J3W1jCUaZydkIQwOqtu/Sg0 L3ruGRY/UcToCy3H0hnq++XEpP0QBrRz3gJj8y7DYcdMYf2i3ZOmCB6yPaMcytdWgGJ+ PvGCQah3ZSwJ/xtsJUTUclZR7u4vYj6Yx0lVqv9EFziObz+EHa7ar0Yl+K4jtu5StFzz OVF4DCKOy/9GIkhsHHktzop+sR4QFrKxxIKATlNkUAakQWRGLyri6eFVgpiiMsSuxVYG H8lAZuHfNAm8SaXuuue79ESej0FbJKQM8AsFGCO2Zf2YHdKfntv9h4KR4srgc57/A2Xm fyfA== 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=TqAPTojSueVJu377Drq2kQO9o9J4y+PAgGpCBaB/JBU=; b=tr9qHKYIqwpoVYTf9pfQR/dYbhtZP+YhuA28UQsMQE/orYhhhP257fpXqtryjvDEKV sRUk7W6yOXfyV3IQ8AancglNb53jz3xZMvcg8397eIswEQ98dSQx02TVOAuELFDnKyBD cMjdTMJNCImQKjz+enBm7Peb5/3Ttdd3/SZMPmfAGDbBT0cMDh2eFrC5/IA6kKkn2ANB kHSf1Hl2PknSFMYCV5bM6gCwSH8F9xTYIfn3vNo4UXlY0WOjcDrZd3oFG3DMFktDC+Uy DzKFp/HZukk1jWM6+U1Dyd0QyALm6G2jK9p3h6NGFAPAe7b7/ASPquF4QWaZKvSSDQqe bgZQ== X-Gm-Message-State: AGi0PuYImMqwvXtHvaT/dmUc33Gv+4M3agz/EPQHlYGHaDC8/WmSf8fA 1ZzBffUvLTFjR0l9cdTj8QuB6Bf1 X-Google-Smtp-Source: APiQypLzUsdXXOwqIh2EboxIjNLKgxTjLaeQRklmipSsS8wAHdTJsadcZdooYxY80WRxneMywOctXg== X-Received: by 2002:adf:9d8b:: with SMTP id p11mr16988112wre.322.1588879184137; Thu, 07 May 2020 12:19:44 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m188sm8928964wme.47.2020.05.07.12.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 May 2020 12:19:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 May 2020 21:19:30 +0200 Message-Id: <20200507191937.16691-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200502171700.28991-8-andreas.rheinhardt@gmail.com> References: <20200502171700.28991-8-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/21] avformat/matroskaenc: Make mkv_write_video_projection() return void 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" It can't fail since 9c8aa86883f28fc27ca790b290c3be2d347b0d19. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d16d607269..158193738e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -915,8 +915,8 @@ static void mkv_write_video_color(AVIOContext *pb, const AVStream *st, put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLOR, colour, colorinfo_size); } -static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, - const AVStream *st) +static void mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, + const AVStream *st) { ebml_master projection; int side_data_size = 0; @@ -927,13 +927,13 @@ static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, &side_data_size); if (!side_data_size) - return 0; + return; if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR && spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE && spherical->projection != AV_SPHERICAL_CUBEMAP) { av_log(s, AV_LOG_WARNING, "Unknown projection type\n"); - return 0; + return; } // Maximally 4 8-byte elements with id-length 2 + 1 byte length field @@ -981,8 +981,6 @@ static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, (double) spherical->roll / (1 << 16)); end_ebml_master(pb, projection); - - return 0; } static void mkv_write_field_order(AVIOContext *pb, int mode, @@ -1306,10 +1304,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space)); } mkv_write_video_color(pb, st, par); + mkv_write_video_projection(s, pb, st); - ret = mkv_write_video_projection(s, pb, st); - if (ret < 0) - return ret; end_ebml_master(pb, subinfo); break;