From patchwork Wed Nov 18 13:05:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gil Pedersen X-Patchwork-Id: 23686 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c00a:0:0:0:0:0 with SMTP id c10csp248295ybf; Wed, 18 Nov 2020 05:06:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPmS7VrwJy4E3pnFlFD1PFF06mV7namuzxFsbHYyUXr65kvvkNGzelH1YInvoKd2AkTXMr X-Received: by 2002:a1c:9695:: with SMTP id y143mr4339245wmd.70.1605704765776; Wed, 18 Nov 2020 05:06:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605704765; cv=none; d=google.com; s=arc-20160816; b=q75Oh0VxBMvX9tTNzS2qra5OkRDT+XIBDocUQJDO/HxTLZ6cgouAHIuPCyRav6adzU jrFtF61nI31Xm2OtU5iC8VElG1otPtYS17RDwjeQfCYO2CI2ZbaVW1+P8Qx1MyvOIF59 FVWolmHheGs1EPf6sHG5mydIt7LmxUQ1YNOXFqzn1UOEvL3lxxo/NW2HSP5IvNOt2LN8 qPfD2uvSfDhUVpuWc9yPFxaRJp44iy6id4PevmU+wd3RJ4VSXeGIZ4ITNMI8LAiUltNO jGAnzq892sD27Rwpo3hANfks6CjuPw1P6zWcRwjj6hKNgnQNJMPC7cnWUffdKN9uYvjT MQBQ== 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:cc: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:delivered-to; bh=cu2ZMWWPuc9PsxxDpgEMXco5GxAsNHSWnwp/XcYy0cY=; b=YYhffv8tRUGR9xj1/ySVu6LJDLOwOOHUKzCL8yQiZe7IsXtOjwIDoMj3J3EaaIrD02 KMk3cqmpeuB/JG5gvnmMxFqVIGhMK9NY19o1ZsnGFKmba48T7KfFPUNoApynKP0/TfU2 vsm2px2BDkcc+zZnCD6bO0vCezClluuPOh0a5BRTZKU4RRzDDMgkT6//j5NJPMUfPpdu vmANNoEZOsyY9ID3YFHGKvDSEyrhp2sgIHPxC4z4Gx1YS5HmMFYSd/Oko2foHqPjqVXS fAWnqxMGovPMakSz24NfpH3wTTPFfhjK9kPMoGY6OmIg4r0kqLUbZwcS/7hWyGd2jux3 goIA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d6si23162688wrw.425.2020.11.18.05.06.05; Wed, 18 Nov 2020 05:06:05 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E00A68B591; Wed, 18 Nov 2020 15:05:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B43468B480 for ; Wed, 18 Nov 2020 15:05:45 +0200 (EET) Received: by mail-wr1-f47.google.com with SMTP id d12so2069163wrr.13 for ; Wed, 18 Nov 2020 05:05:45 -0800 (PST) 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; bh=mVQy1dVdQ5+MrdCBm6K4OitLnz2f2y+Qbs6XqK89bnw=; b=XvsQ5sbWgjBFxaa7ebUrb8uGr86fB+j/CP4XGdYMZK59Rsx1IR6+KAwBV/EqILrMEs p/ReG43QKDHk0GvaEuewhrP2AQTk2vUJsks2DUBSjUElZ/ctTHuT9RoMq+lc4DUy+RBq VYja4Z42Mq3XUeR89vZGr3pfv35KHqhjlZOai65+7+E96z3qEKoaQ/P5Jp8duehxdrdg GmoNAemUizwmXR8o/tvjShGXwvdQ3///fmnlItJHzdFQUPwxxUwXLI4VaxuxLcU45RR7 OYdyKsoURYu/zrlMshC7axK3uNUbZQ9GNUzKlBMxzo0iqaoFLdfrGW8cVAIoqSbr+O4c eHEg== X-Gm-Message-State: AOAM531vODli9n5lEqQkWX0mdhdCb+1IdKAMPDSO8M/kfYa1k536sbBw CUFLIHTRcLZsdW4PlEN0ZXetrNQ5D8cwLptp X-Received: by 2002:a05:6000:1c9:: with SMTP id t9mr4521890wrx.379.1605704744220; Wed, 18 Nov 2020 05:05:44 -0800 (PST) Received: from ov04.ovh.net ([2001:41d0:303:c09e::]) by smtp.gmail.com with ESMTPSA id y16sm31757320wrt.25.2020.11.18.05.05.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 05:05:43 -0800 (PST) From: Gil Pedersen To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:05:14 +0000 Message-Id: <20201118130517.585-4-git@gpost.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201118130517.585-1-git@gpost.dk> References: <20201118130517.585-1-git@gpost.dk> Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/h264_parser: use av_buffer_replace() to simplify code 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: Gil Pedersen MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: phQNxbOwqb9Y Content-Length: 1694 Signed-off-by: Gil Pedersen --- libavcodec/h264_parser.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index aacd44cf3b..f39924595e 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -360,12 +360,12 @@ static inline int parse_nal_units(AVCodecParserContext *s, goto fail; } - av_buffer_unref(&p->ps.pps_ref); - p->ps.pps = NULL; - p->ps.sps = NULL; - p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]); - if (!p->ps.pps_ref) + ret = av_buffer_replace(&p->ps.pps_ref, p->ps.pps_list[pps_id]); + if (ret < 0) { + p->ps.pps = NULL; + p->ps.sps = NULL; goto fail; + } p->ps.pps = (const PPS*)p->ps.pps_ref->data; p->ps.sps = p->ps.pps->sps; sps = p->ps.sps;