From patchwork Mon Mar 19 02:25:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8033 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2140545jad; Sun, 18 Mar 2018 19:26:42 -0700 (PDT) X-Google-Smtp-Source: AG47ELsQuGeTmOpcygw8xUUoc3zh1cBcdUwqEViGNSH2ZOLrhofwy5u0U0XCjjk6RrdDkgKzLH/Q X-Received: by 10.223.130.107 with SMTP id 98mr7433111wrb.16.1521426402695; Sun, 18 Mar 2018 19:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521426402; cv=none; d=google.com; s=arc-20160816; b=q7L/DRTjmdhDNS2zaiJMSU4siBd1JbHJXI8+StlcbQuLLVFa5Bvxlk4J9K9AGBcoh3 +DPuApMB7hjGZr3Tbwu4xG51LxTdyS9oeizPEkD+D6FzFEZnXdVW5FwiXYof1PBibDfl A2VH97DzqaekyUt9+6SlQTWS+Dmlf1ohoOtPsZdAEvarCHrlTFVD36VQ1R+qvcGDJzfs kvQtM3t3rKuYjFOdwx9dFA2whz3Isc1+bvJG5oX/IvndzP9ddlLkDxc248+ZcAEgjPLl ATKne7Sa6Itkdya8sJUKFMdUmOPgkYxsjKCw6I6YGmocuBrY61Q1dennm8xWasKnU5Kh AhJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=M53hJlfmpFWaeWUrgsoFU7qR+xPuMZdH2QUSE7fYdxI=; b=YdI9H8c8ZpYBv25GE52qAfKEiZdLPsB2ROtuX0j/mvNvdLFAFk5U7lKt6BrnjfwU+P l10gCef83qky28hIHBnvNXBbp3ABGY9HyVt1Hb42JbK8WwynAmZ1M+fggSrfhtBMQZM3 ZfFRlAHN6W9w2bK2nKD0b+Y+AeSWyPBQPKMlo7cFJRzp5Gf7bZXfVGjV0F0/iUglB8lL 75ZKAAkQE2MX7TriDFCXw9FjgYLP3z1wGXOcKLaI/uiNoM9fM+lYMPS1zhO9EaWwWz9P AQ71u1lblCqbkEyABDyOUjchm6spMuoqCdGb4+amQR0nt1X3mjImC4Oqp0nJYXaoK/+9 qkpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tFY456zI; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c12si9741934wra.66.2018.03.18.19.26.42; Sun, 18 Mar 2018 19:26:42 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tFY456zI; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1055689C2F; Mon, 19 Mar 2018 04:26:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 047E868988D for ; Mon, 19 Mar 2018 04:26:15 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id h4so10723668qtn.13 for ; Sun, 18 Mar 2018 19:26:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=gPdB0PyvrRi3wZgJHdFoXVAsf3KPmEi7tQtntIe8wzU=; b=tFY456zIQjZFrQZEQV6stVq8XskbN7PnjXSzAAzUOGq1dz08SlbUhRgkrjg4tl0c3z QiOXQbEVkyJE1jgL3SeFY/AzYL26MCZP7a+Eqwt4cDhKtl/ppL5z8z5d9Wo6eSc/HvI8 48jk8jLYZeReDIJBkJ9x5RAM1YXCSXFphHUw+aJC7X7HuPtDUl7wgGf5WAgKgWfH4GOx M7dGTfysCv5vqc+Rg3pn+vau0De9vKyC/9fMYPZlQvI7SqiLMAdmmkjOWjSO6yX4ELEk yjRoTGD2OD1EvlGgOxLt4HVoiV8JwRsFioQXYY4dlrtnu8q4KhlwK92DDWM6rLBkYXXM 1MKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gPdB0PyvrRi3wZgJHdFoXVAsf3KPmEi7tQtntIe8wzU=; b=HBakTrSdMATZ+3CNR15jhk9ojujvQ7BaNUMflbjTmwhiZlWQpdIKGt7YRNRvOpfqxk Q6hsM3sKTIalU0lvEMfk7TcjiZnAcGP5OA5yIlmDkIU5s68jFZGGopwsZ9iMKHSp9iqo Hs8UbjsmNuRxjnUBW6WrC37iJyCM2Sb3Ql9pw7Hmi/U+ob0Smaycz7p0Yq1aFu+1Q7OG KRuPtEU2BK2Kem2EGz6YRhuhYFlj462Qk1hSTA85HFFa+ekyHvLs2nSiRs8m0uqt7vf1 oB+442YLDoItG1dMulIEpY2H/iQ51Tsu4gB1OCNWIC01CxjFXDvAH/zgwMKlO5YYGN/s TWDg== X-Gm-Message-State: AElRT7FbisjoGmTkIcmHafkwx4T5oXq0lykecANBX2lJN0z3SCRwLrKK 4uxubwozPGD+FwZC2WclMoDGBw== X-Received: by 10.200.34.59 with SMTP id o56mr15740486qto.103.1521426387414; Sun, 18 Mar 2018 19:26:27 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id p8sm9928302qtp.61.2018.03.18.19.26.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 19:26:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Mar 2018 23:25:33 -0300 Message-Id: <20180319022533.7048-2-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319022533.7048-1-jamrial@gmail.com> References: <20180319022533.7048-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mpeg4_unpack_bframes: allocate a new packet when data needs to be changed 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Nothing currently guarantees that the packet will be writtable. Signed-off-by: James Almer --- libavcodec/mpeg4_unpack_bframes_bsf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c b/libavcodec/mpeg4_unpack_bframes_bsf.c index ba970794c5..00cc35c2ab 100644 --- a/libavcodec/mpeg4_unpack_bframes_bsf.c +++ b/libavcodec/mpeg4_unpack_bframes_bsf.c @@ -149,8 +149,14 @@ static int mpeg4_unpack_bframes_filter(AVBSFContext *ctx, AVPacket *out) av_packet_move_ref(out, in); out->size = pos_vop2; } else if (pos_p >= 0) { + ret = av_new_packet(out, in->size); + if (ret < 0) + goto fail; + ret = av_packet_copy_props(out, in); + if (ret < 0) + goto fail; + memcpy(out->data, in->data, in->size); av_log(ctx, AV_LOG_DEBUG, "Updating DivX userdata (remove trailing 'p').\n"); - av_packet_move_ref(out, in); /* remove 'p' (packed) from the end of the (DivX) userdata string */ out->data[pos_p] = '\0'; } else {