From patchwork Wed Jan 18 17:13:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 2247 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1117172vsb; Wed, 18 Jan 2017 09:13:13 -0800 (PST) X-Received: by 10.28.218.4 with SMTP id r4mr12594507wmg.105.1484759593461; Wed, 18 Jan 2017 09:13:13 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l128si9682126wmd.73.2017.01.18.09.13.13; Wed, 18 Jan 2017 09:13:13 -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 CB3D5689E88; Wed, 18 Jan 2017 19:13:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69D0468A0D5 for ; Wed, 18 Jan 2017 19:12:53 +0200 (EET) Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 47645162; Wed, 18 Jan 2017 17:13:03 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Jan 2017 18:13:02 +0100 Message-Id: <20170118171302.10946-1-u@pkh.me> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] lavc/h264: simplify find_unused_picture() 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: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/h264_slice.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index fe71d57421..ad7a75fa2e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -254,25 +254,15 @@ fail: return (ret < 0) ? ret : AVERROR(ENOMEM); } -static inline int pic_is_unused(H264Context *h, H264Picture *pic) -{ - if (!pic->f->buf[0]) - return 1; - return 0; -} - static int find_unused_picture(H264Context *h) { int i; for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) { - if (pic_is_unused(h, &h->DPB[i])) - break; + if (!h->DPB[i].f->buf[0]) + return i; } - if (i == H264_MAX_PICTURE_COUNT) - return AVERROR_INVALIDDATA; - - return i; + return AVERROR_INVALIDDATA; }