From patchwork Thu Nov 9 00:39:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5953 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1406391jah; Wed, 8 Nov 2017 16:39:24 -0800 (PST) X-Google-Smtp-Source: ABhQp+Tnqt2o/k6fOeaH9wTdidoP1aCYLTW0eTMeEz9JC0LDpv70V8vp/hcbvnPc8m/A5zTIBvZv X-Received: by 10.28.111.76 with SMTP id k73mr1760057wmc.110.1510187964730; Wed, 08 Nov 2017 16:39:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510187964; cv=none; d=google.com; s=arc-20160816; b=K/p6AWj4xareTCQNB3wr0gZ+Q/tSZN2nPSR1/Lkhx3dbFI0AgkujpQIyK6ZudlhkE3 z3GUWDLpRB6R7kT9+u37kcL9biolNuQxERW3RnPNoNVE+7bzFzpInJd6SfdjhbvYY7jk FYGt0nRBfB8ciiidSAn2a/3Bycvmk14nysSLvSu7GjmU0A0OaxXBfzbszj6oAAIJkWiN d3IQIHOqPCyarfw/MfMpF/FA4fA0cPgBUFS0q9Pjd6x72b0OarDFKpQn0/U3PXF7nZQc HvVS+R9S8LRqWcQ7IJmNeyYMyE+vOcA4qLqp9SNBD+sAdm+NFu2I9+6kEj3RP7cW6G6m oDTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=RMAJJIEw65W+XZdK//SBcoqiV5iAiI8bt1EiHYzAMP0=; b=fWDNVGNuRTlJ9kRl0I//xhbaoFOfzW8z9GePdyzQmuAgIywyjhWO4xbf0cE+GFmJ76 /Bqoq7kFqfXBwRn5tuvwqBmow0cxyMqZqz3IYgxKYN7xI/9ZPmILZQB7QqlQkvFwEDAq QLFUgUDOoGBdCyonb+SEQtFpOM/0sDJt/2+Nv0jGLnzlkK/72PK136oi2Io+vsyX6iK5 hSMXOKABoJKH0AZqya4i0l0Bb7XqNvMGDivGugc5Cq5uT5SrjnqPzaZqXPA4NVJz4zTc 6aaiHiXXyKaXLHuwgPakFAKuKhvxR03xJNVe7MG719bJAEJoF85hYzI8gS4x4JWHUuXZ DBLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=h+OZCvcU; 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=NONE 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 199si4593579wmw.155.2017.11.08.16.39.24; Wed, 08 Nov 2017 16:39:24 -0800 (PST) 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=h+OZCvcU; 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=NONE 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 3189A689C26; Thu, 9 Nov 2017 02:39:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1604468978C for ; Thu, 9 Nov 2017 02:39:00 +0200 (EET) Received: by mail-pg0-f43.google.com with SMTP id o7so3293623pgc.4 for ; Wed, 08 Nov 2017 16:39:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=VAsrHVxs0Pv0zDavbo+ehG5wY5nAIrh1A3N7+RBMNaQ=; b=h+OZCvcUgaMeUA1d63tilIzdJswtxj7hq2XAyD9jVgIIQp/UPYwrO/nraaqmVfEFzu RzpUcqQEHNshaFt+haK+x4gfKR+5GGIsQ0UoWcL79BIBqSvI/On76wO+qgPiXEVrDa/W P3MYOct3orxYvuakK/XOfU1VqC94zGvzp7mQk+uvMTKbH7dyyhR+ebQ+hoB9Dk6+9rwD eew/WE2og3SKSRMrJ8M+D8gnRZ+99bPIOVxggbJag2IAb+1lQAxMdLi23tx1r/zshIMn piPT8auIXr7gORYBypx361z5nIGH/nufpDzEhf6K/oF0m29GtQHTyt6OuOZk6aZ7VfGi ZL/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=VAsrHVxs0Pv0zDavbo+ehG5wY5nAIrh1A3N7+RBMNaQ=; b=W6sXkpZ+NJCexrrnhbF3lv87Kolgm7e9sYfISulGnF7R0iI6SaCdCllLiuUFe/2V+1 JLrg/wd4w6f8L8mN/c569nYaEePZ176NLkfYam0/CyxdGmND+cnvmhZf+yAinW777aOF knLhzhI0AqNsXnpMYhl9o80kziO57M/0AO7J28GtMa1bswGnhMDA1zwglzK8sT4h4oJs amrNrikPcxiOjkvClWKyvE5D5fdumVV8DNwVlDUQXGIYIMO3C6EAsUxsIQz0RzJ6D36T 1dUGdK61r5ZpFieW4o5RpW32tvQ2O8PQ/Q6MvqgZlzXO7DYWI7CaWHSOOQNpfi+Usad0 I+FA== X-Gm-Message-State: AJaThX7vKo7yBSiWpYELaFy7rYhEIwtXOd2Cw/RV/NWdF8SLOL0486rP bs/tCc32jZzVrZ10CY/oSyU+xlL6 X-Received: by 10.99.62.207 with SMTP id l198mr2090753pga.376.1510187951539; Wed, 08 Nov 2017 16:39:11 -0800 (PST) Received: from [10.67.68.23] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id q16sm8454084pgq.79.2017.11.08.16.39.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Nov 2017 16:39:10 -0800 (PST) To: FFmpeg development discussions and patches From: Jun Zhao Message-ID: Date: Thu, 9 Nov 2017 08:39:07 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/2] lavc/libx265: switch to ff_alloc_packet2 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 5afdf252b3bb6f8c7a276c2a8bde8f4a95d170e4 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Wed, 8 Nov 2017 21:04:51 +0800 Subject: [PATCH 2/2] lavc/libx265: switch to ff_alloc_packet2 ff_alloc_packet have been deprecated, switch to use ff_alloc_packet2. Signed-off-by: Jun Zhao --- libavcodec/libx265.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 784b51c52d..4456e300f2 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -294,7 +294,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, for (i = 0; i < nnal; i++) payload += nal[i].sizeBytes; - ret = ff_alloc_packet(pkt, payload); + ret = ff_alloc_packet2(avctx, pkt, payload, payload); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); return ret;