From patchwork Mon Dec 9 22:26:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16683 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 DAD6144AA6E for ; Tue, 10 Dec 2019 00:34:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C069368B71B; Tue, 10 Dec 2019 00:34:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D47968B0BD for ; Tue, 10 Dec 2019 00:33:59 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id y11so17906928wrt.6 for ; Mon, 09 Dec 2019 14:33:59 -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=E6qi7loPGJ7vytpfIabAmzwqdBq48TTDXZJj6zROReY=; b=nzilGab0P5HcMr/bfwc1p86lku3h+6ft9sRvQzHzqOnfWfcBFP2XAOzT/XYZCPipU+ JIzyut2Qxh4Coadsa/mSwS1Xy8hPWLJ1SlxDMlt/aF27H1PeKAvIOhFVPJQOr6F/7tIj qfBgG3KRY+K8RZFvdsiZCQB9B8U620cWbgD4xAVh90ItAIXjyw6S4ANOTa7/k7EnfPRw wZjYQ1SFdF6SoFErbvFqU4zvYBB+8mSzMv7k0pVHHR43vmDG9FQOFpbZulDot/5r0AUv TrQi+4GZ5hUEfBuUCKFH+kMz04BHhwEBPTyVBmZYTegEiz6c60K4Vi4u9e7M1VAhzmPU 4lCQ== 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=E6qi7loPGJ7vytpfIabAmzwqdBq48TTDXZJj6zROReY=; b=PVTJ4NO8hNQoYU629NDmAu9JHah8OiolZP0ChGdqKi1f0geKV+rEelPR2wEfjukenn Jk8DphbVayHj9kncu3Fqt0yDyxhKwvic+0SxBm2/h2xbcgMwgMu1ZdFhc7iTUaxYvItz c20lnv9h/HQseNF0VWRX6iZdfCIEJaf1dcKOmjugL1nMdml1qgd63sPTOvGgJeloDUC1 R+9d650cpXG5DZ6ttFPVeilEKrKTS6nGseRUlqgQ0AKYInH2bvOoy7rkQoMe12ZgAUXc tkmN4ugJV5NvpjiHaGNLmMJ2deP4Yqx0l6KXHPyK+569HwOG98GWUFEnMyI80yPHF0aL pIvg== X-Gm-Message-State: APjAAAVcovkaPO1bxACiwW41PMEB3zCanI7klkdx8H3kQz/f6Tux/Wye EeCLSmdUN4DBxQyB2KoVpcrwlDnt X-Google-Smtp-Source: APXvYqyeDStZyG1XLTWiyStHV04lyEFqvR9MtmOhbcurzl2cM5M06uGrDXGkeA0jr3Yn24XRAE8Jhg== X-Received: by 2002:a5d:6284:: with SMTP id k4mr4453683wru.398.1575930838565; Mon, 09 Dec 2019 14:33:58 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id v22sm865893wml.11.2019.12.09.14.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 14:33:58 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Dec 2019 23:26:00 +0100 Message-Id: <20191209222604.28920-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191209222604.28920-1-andreas.rheinhardt@gmail.com> References: <20191209222604.28920-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/cbs_h2645: Remove redundant assert 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" cbs_h2645_assemble_fragment() asserted that every unit of the fragment that should be written contain data; yet this is also asserted generically in ff_cbs_write_fragment_data(). So drop the redundant assert. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_h2645.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 4b17780836..7c92ae4871 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1387,11 +1387,6 @@ static int cbs_h2645_assemble_fragment(CodedBitstreamContext *ctx, size_t max_size, dp, sp; int err, i, zero_run; - for (i = 0; i < frag->nb_units; i++) { - // Data should already all have been written when we get here. - av_assert0(frag->units[i].data); - } - // Content with worst-case emulation prevention. max_size = frag->data_size + frag->data_size / 2; if (frag->nb_units > (int)(INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE