From patchwork Tue Apr 2 13:32:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhupengfei via ffmpeg-devel X-Patchwork-Id: 12589 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 651C7447FF3 for ; Tue, 2 Apr 2019 16:35:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4FEF168ACCA; Tue, 2 Apr 2019 16:35:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C7F968ACC1 for ; Tue, 2 Apr 2019 16:35:17 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id c1so3432355wml.4 for ; Tue, 02 Apr 2019 06:35:17 -0700 (PDT) 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=wscABFAYsOcOls1vJUvmiQhdmk2E/mgNYY2En6YeJiI=; b=NBw/yowWbmijUnUYuY3R5KlR73BWEHhab+CBO4vAFgVHEwcPZtIkNE6X8EdVXCCRFX ltLGUNaDrgTCx69n4O72L9Dt9pDOnIgWCK8zqbm3nJVX669a8qghfQyldoQhQeHunFOL 27AtnzUZLoytkOTCZfyKW0UKK0OjRxE6eBoFJCvgBPpJfJh2BX8Go4MlsjK5o9IpEcUN ADHAut4Q15x7WM2Y8qHNw7zuqBaInAicdlq793GVEGTG5FfbgHLNwoVci7cQOJGJMh0U 1HS0tSH2f3HxH6I7s5BkWCv3HibsfYcQvuv5uY2wm4MU2ZDoi4iF0a3gVY9hpdd11YsV p2ZA== X-Gm-Message-State: APjAAAXoFScLTq7jD33Dh4Clee7YelJBK5HCGzy5aQpovMQW41xb1fYc rZZGHtFi3O84Js/4/ZJU6hNuag1n5fo= X-Google-Smtp-Source: APXvYqxmSYRmFKuR13e9viAwDG5VU4ZN3MQbImWX2gy9CnBRhIoXur7ScNW50PR7FXcyCRrHmrKOMw== X-Received: by 2002:a1c:a184:: with SMTP id k126mr3560640wme.71.1554212116542; Tue, 02 Apr 2019 06:35:16 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id t24sm15566886wmi.10.2019.04.02.06.35.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 06:35:15 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 15:32:58 +0200 Message-Id: <20190402133305.3328-9-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: zhupengfei via ffmpeg-devel 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 06e9081638..6a1f22ea35 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)