From patchwork Tue Dec 10 21:59:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16705 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 D57BD44A835 for ; Wed, 11 Dec 2019 00:00:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 51ED868B059; Wed, 11 Dec 2019 00:00:14 +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 9EDC768AFE2 for ; Wed, 11 Dec 2019 00:00:08 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id d16so21804173wre.10 for ; Tue, 10 Dec 2019 14:00:08 -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:mime-version :content-transfer-encoding; bh=guzOo7+ozCUliyfT9hG5gj/ZVVpcuXwSKJohssGTu9w=; b=SKElnNCNLjSj8Pf6bZojDelrKmv56e+JolFRmLJlq+Cr83XkEQR7jalKCRqGhMvKHF qd71H/rX2Z+nVVE6gc8dGZOSOUKJccu+BtMWLeT8iPZo4dsIoo4L1DcWfdYWD44CBQ6+ K2F6F8Xb+HkSWjg4RgLUO3RW7R05VTzrrswfOBa/6P/WLAunUMw5SYciohMXQAFYXHWD gtkXDTumJjDxzX0zEYE83yXydp9sxihD6A/8tnFkbgRwOf/8BO8rBMSmDwxB4uTq6eXq XEg8bYIUaYG4Dlw+roS6JL/QG4kH3vuhqdXQEMH+thsiBaXkryNe5ACEYRD1w6zWZZT3 JJ2w== 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:mime-version :content-transfer-encoding; bh=guzOo7+ozCUliyfT9hG5gj/ZVVpcuXwSKJohssGTu9w=; b=Yi7d0PAyI7sjvIEGmjCWMKPw555gch65QNrwcXQisiX30Ga6DYOveIdE3m6jbW93pq azc5V0F6SbdDaZTAeIeqZWne2/0iwemxqMv3Olcjld1DsuC2iAh+TbJmUOPyrhWDKwhc 6xZ7vOQCtnHxoI+tbf6hkQx7VEtKfDCy/a51t3Q3Srew5wPUqdpUGZWyBl1SF9yc9Aw6 nCf/ILYUOkAFTQG7ciUNFuZGdRzUKg0WEfeiRh3SH2BOxa+RfxdpK7lDERlrwZoR8Tqd t8Y3GcyZfZF3IasWZp4lY4VuEYzq8bj1bJ1kpYuwsY8Vs1eXDUDLsWfsXSuaCUsiem3Y 2r7A== X-Gm-Message-State: APjAAAU/JDQ+ogt9pOc0uGYNrGXQRXYFdA0qL2RsaisJGgNHxxUlld9G AELPLB9HDtXmN/HA7qci0/jqzqAE X-Google-Smtp-Source: APXvYqzpQSexw/IloHTIGfjHQFfwwWVBVqiXO7aZVFvBkrPlnXVFr9pC+RdlIyTqOscw07Q7Pzh2jQ== X-Received: by 2002:a5d:4687:: with SMTP id u7mr5649183wrq.176.1576015207187; Tue, 10 Dec 2019 14:00:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id n129sm3876381wmb.1.2019.12.10.14.00.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 14:00:06 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Dec 2019 22:59:45 +0100 Message-Id: <20191210215955.11178-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/11] avformat/mov: Use ff_alloc_extradata for dvdsub extradata 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" Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7553a7fdfc..733f4e4a34 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2255,7 +2255,7 @@ static int mov_rewrite_dvd_sub_extradata(AVStream *st) { char buf[256] = {0}; uint8_t *src = st->codecpar->extradata; - int i; + int i, ret; if (st->codecpar->extradata_size != 64) return 0; @@ -2275,12 +2275,9 @@ static int mov_rewrite_dvd_sub_extradata(AVStream *st) if (av_strlcat(buf, "\n", sizeof(buf)) >= sizeof(buf)) return 0; - av_freep(&st->codecpar->extradata); - st->codecpar->extradata_size = 0; - st->codecpar->extradata = av_mallocz(strlen(buf) + AV_INPUT_BUFFER_PADDING_SIZE); - if (!st->codecpar->extradata) - return AVERROR(ENOMEM); - st->codecpar->extradata_size = strlen(buf); + ret = ff_alloc_extradata(st->codecpar, strlen(buf)); + if (ret < 0) + return ret; memcpy(st->codecpar->extradata, buf, st->codecpar->extradata_size); return 0;