From patchwork Sat Mar 9 12:24:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter F X-Patchwork-Id: 12274 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 76111448F8E for ; Sat, 9 Mar 2019 14:25:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5290168A623; Sat, 9 Mar 2019 14:25:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0371689C61 for ; Sat, 9 Mar 2019 14:25:06 +0200 (EET) Received: by mail-io1-f46.google.com with SMTP id y6so120910ioq.10 for ; Sat, 09 Mar 2019 04:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=/m1W7mVdPwaZZnxtx+nU4HMdkOU7L7iAaxBIj0XcnDo=; b=ZzxqXCR25A0d0RgvIeL8ZWvaRbZhTcQPnOZctIBhbis+dETP6f9YW5zFwGLlk+Qtn1 rTqQgiclis37R2ALjrTSagnIGZatb1bRSaWvKOSSkDjGh4NY8mHOPt8oQAn4AbQJ0N2v M7ARNJwk1VqVWko66c4u3w3LmWaf1HRjsIK7OZNx7H74UV3s0aFr4RytyTn2a9fOPRUP IMqbZPk5E0Idsso/FxMEhClHDxKRHlG9CZSxCtWocXo0hEleVjwQ9Bw9lRUAUXD3MntO qTQ0FP/WCb/WWQ9PEME3ikZTcyzbweE7OgL+EyRvoxyMyqmSZ3oQIH0P8AAE253kKaN4 q2UA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=/m1W7mVdPwaZZnxtx+nU4HMdkOU7L7iAaxBIj0XcnDo=; b=BzcI0MPrOLh+KCxVBjoxVQEjvXq+aBK7U+KrS7KEQaIUErw1yEyMiTeal+lIlY7TPh pHIWkHxEdn1Aa4mpVVOHCARPersp0JeJlY1famEeRnAFZnOSOvnaOxWpSbb7sloVSTTR xWHSmAyc5PkaGiJL53n8Ysq2Bktgj1wJ8wFcW4Lj9OfFzgvC5ia2eeeWVtqgSbjKLCtE Sv6WTAM7gtphW4Z+9vAxE3bG6EsZkBLu1AGYTnnj87a3CoCtjLRqpJWlsDYYfN09I+yk v/hXLPjoecCTi3BVcXzIlcYmf/zGEyCi7vR5JLmksFtJa8JUCJoY79vc0CgwIbUi1i10 YtyA== X-Gm-Message-State: APjAAAVZPfMqNBgKEIZtJ/aZGOxpOOUeRP2rSPvE4EPRf0NDc0rNcACy 1xLY4s6vQVussSNtLebOUQoNq6WO31eiAj7LArIEbu/N X-Google-Smtp-Source: APXvYqwURP+i+pB4vzHQrg0H/vPUvNihcMHV+BwB611ainFa/xv3bK1wVCtBN5ueidpKUhrJdXfm7nK6TNBYfvcNFbo= X-Received: by 2002:a6b:7f05:: with SMTP id l5mr11643531ioq.224.1552134305103; Sat, 09 Mar 2019 04:25:05 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Peter F Date: Sat, 9 Mar 2019 13:24:52 +0100 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] avcodec/vaapi_h264: skip decode if pic has no slices 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 816e9156235a5d7d895b09c0235c9f8f1f7703e7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 26 Jan 2019 19:48:35 +0100 Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices --- libavcodec/vaapi_h264.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 5854587a25..81a46fa747 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx) H264SliceContext *sl = &h->slice_ctx[0]; int ret; + if (pic->nb_slices == 0) { + ret = -1; + goto finish; + } + ret = ff_vaapi_decode_issue(avctx, pic); if (ret < 0) goto finish;