From patchwork Thu Oct 17 08:29:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15805 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 091F9449FA2 for ; Thu, 17 Oct 2019 11:30:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7CAD68A7C6; Thu, 17 Oct 2019 11:30:54 +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 DB51968A67D for ; Thu, 17 Oct 2019 11:30:48 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id i16so1581106wmd.3 for ; Thu, 17 Oct 2019 01:30:48 -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=UzKMwrlduryebfourBTpSZ6Vy28+lR5JMCXYK4HYKN4=; b=YM/Q3KCWoVV1vRBCt9EnkkZwytcPZ3DvkRF+/CcqDyma0lkJZbd3Rh5UJbuV6W4X89 T2ALverxQp1r11iN3E0gOHwIXtisyZo7Az0GmmrBcl8NNljBFMn+Zz2+VgXkaX5+vk3B B/GD/oIL9ua5VSBLPUgmlxZ/FVKwzxbt0E/Cd3w6EBhj3SF1FLnmz1l2aB9TvYfGMRZS nxjnAUrPEoOLBJUG3Y2F+YeYCXH/HE6AvrZiWa7/pQvuwRq6/aRCy1Ud+sSnK0b+d19k 1UL9dxz9HEKwa4oiTQJ7Lbk3KEX0gXEaoZWiu6gCg82r2y6kyNn3Rbt5j0lkc+99gx8W lyUg== 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=UzKMwrlduryebfourBTpSZ6Vy28+lR5JMCXYK4HYKN4=; b=c5HeuBi++Xbudb9bfXlw8yDz77tfKcqrbUPU1Dn3V8yEC1QGS5+QaAxbLySTIuTZ4N BNJX8ZPdYDKJxrOqbCw/K2Vxyk+yGOvxgspOPAaQesxmOVW0lyMkPPMR0cP4Mjc6HrhV juvdeNTbcOOPY6j4xy0SG6ZXdMxODbM4A1C8YxOAH1XH6zxz8nsr9PObIP5pbTBDk0iE 6GNdDqtZJNqL7ihqx1Kqdul2SqiS011m42GGYZI8VB5/KDnWTig/E4EhYt6bR0Fuc6+K VlcF/Hr+zFy5gj8xZVauf1j6k2epEe4jK26w3y4WLQ8JIgHmHKwB0K/Q/AgXSRYLsylV PTWg== X-Gm-Message-State: APjAAAWfkq4lOigKtWszl5lDNBdEwa6AcgEfV4d82vZH/3SXG4/SkSty oKdr9wRCOJJcgj9Ij7GHShlFXa1H X-Google-Smtp-Source: APXvYqxyG72PPV1MXXhdWe+c1YU2MUg/FX3MYHbIVrD3/mW9X2jNf3NZvdQskanm3oPtXFUsZpeJGA== X-Received: by 2002:a1c:dc83:: with SMTP id t125mr1888064wmg.50.1571301048071; Thu, 17 Oct 2019 01:30:48 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id l7sm1369273wrv.77.2019.10.17.01.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 01:30:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Oct 2019 10:29:44 +0200 Message-Id: <20191017082945.13534-14-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017082945.13534-1-andreas.rheinhardt@gmail.com> References: <20191017082945.13534-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/15] dump_extradata: Insert extradata even for small packets 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" 3469cfab added a check for whether the extradata coincided with the beginning of the packet's data in order not to add extradata to packets that already have it. But the check used was buggy for packets whose size is smaller than the extradata's size. This commit fixes this. Signed-off-by: Andreas Rheinhardt --- libavcodec/dump_extradata_bsf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/dump_extradata_bsf.c index b641508234..0b6d404792 100644 --- a/libavcodec/dump_extradata_bsf.c +++ b/libavcodec/dump_extradata_bsf.c @@ -51,8 +51,8 @@ static int dump_extradata(AVBSFContext *ctx, AVPacket *out) if (ctx->par_in->extradata && (s->freq == DUMP_FREQ_ALL || (s->freq == DUMP_FREQ_KEYFRAME && in->flags & AV_PKT_FLAG_KEY)) && - in->size >= ctx->par_in->extradata_size && - memcmp(in->data, ctx->par_in->extradata, ctx->par_in->extradata_size)) { + (in->size < ctx->par_in->extradata_size || + memcmp(in->data, ctx->par_in->extradata, ctx->par_in->extradata_size))) { if (in->size >= INT_MAX - ctx->par_in->extradata_size) { ret = AVERROR(ERANGE); goto fail;