From patchwork Fri Apr 19 23:41:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12830 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 D16414494CF for ; Sat, 20 Apr 2019 02:50:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC73568AAF5; Sat, 20 Apr 2019 02:50:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F9E068AA9B for ; Sat, 20 Apr 2019 02:50:28 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id z6so9823157wmi.0 for ; Fri, 19 Apr 2019 16:50:28 -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=+jPezI2pr5Nz/MHGBuEmwEvovcf5rmK9RMQH8I7VwB4=; b=CHwVyTKSfmwdD4lV0JjPEF5+XGv16gq6vPRSgGvxElCydBlmzPtVffaLQ4b3yBykvF sUfDyl3/2Ed0UaW84vVkcAYORWndP3V2Ec3p4LjbFTspxiMfY8VwX1gDIrSuJxPnrAGC 1eh5ml4pSNF5oyUby+r2KJtAgmO//sRRjTQO+4fEH9N9ivdLR45uReuNDolSn9pROwJ9 1Ms8Xln4v8MOeEDY86sO/5N7TmlncoHoywlKsDultj5Fhi7/LUU3kojhhrkzFfXhjjC5 8/G2Hj+d4MxSsp8fPJsaJh+w703lLFG2sCXu8OdMY9UbS3GIcEBD8+NiUfZQCJx50uis Kr2w== 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=+jPezI2pr5Nz/MHGBuEmwEvovcf5rmK9RMQH8I7VwB4=; b=Y78plk2mXjVFhTgnfz5VJe2/cZ9WuCe2kVSsQLlWTBZf/2FBc1sQVquOUrwqXWgkJ2 Bq1GRIysp1iS2B/85anmFCPK3tHYeBI4uS7mJYs4Et/3k+PIbP7WND/fbXPEdy2rR7+q W9gn8N5lJ9gSe+kMh7X30uyXQpkFrAgxTGLIAqgaW74uX4bK916OxX4wF8TKq0J6u5na z21r0yv9NE43XDyf1T63KP7fyzm+ezdI8syTmLvx2Jd7plArZucieIhylPZdqAMv8Gzh XZ3uEIsmF6bH2AvqontJag0GOc6JIFJemIUf8gDnQjII14wht86GWBErr9VRFqU+Nl3A t5Eg== X-Gm-Message-State: APjAAAV4qH2CphzJnfoOM9Qo+4xHLzoCtRtGlYKyxBNCTmI5vvsKwo1Z QfkYGaU87KVvZ2YsfsFo9UNFGWet X-Google-Smtp-Source: APXvYqziQbrG53Ljes2neTd28diZpArkdw+QPYEe1f7Tz/Gr3zlhXB9FzBmMbFuJDFYzx5vT5vkGwA== X-Received: by 2002:a1c:f115:: with SMTP id p21mr4350884wmh.93.1555717827855; Fri, 19 Apr 2019 16:50:27 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id t14sm6002395wmi.16.2019.04.19.16.50.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 16:50:27 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2019 01:41:03 +0200 Message-Id: <20190419234110.32980-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419234110.32980-1-andreas.rheinhardt@gmail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> <20190419234110.32980-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/15] avformat/matroskaenc: Remove redundant check 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" All places where end_ebml_master_crc32_preliminary are used already check for whether the output is seekable, so the check in the function is redundant. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index b300b23938..316a632805 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -379,14 +379,12 @@ static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, Matrosk static void end_ebml_master_crc32_preliminary(AVIOContext *pb, AVIOContext **dyn_cp, MatroskaMuxContext *mkv, ebml_master master) { - if (pb->seekable & AVIO_SEEKABLE_NORMAL) { uint8_t *buf; int size = avio_get_dyn_buf(*dyn_cp, &buf); avio_write(pb, buf, size); end_ebml_master(pb, master); - } } static void put_xiph_size(AVIOContext *pb, int size)