From patchwork Tue Oct 30 05:24:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10845 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 020E144CB02 for ; Tue, 30 Oct 2018 07:25:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 66E1568A660; Tue, 30 Oct 2018 07:24:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3473868A644 for ; Tue, 30 Oct 2018 07:24:30 +0200 (EET) Received: by mail-pf1-f176.google.com with SMTP id f26-v6so5199154pfn.9 for ; Mon, 29 Oct 2018 22:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=iCaF16n77f+jOeJM3nvILaH3fA6e7TfASDXae7sIWUE=; b=DXRk5Ty3lYmCDa1WP97CR7OookU9/rCi8FVAFDzmlJsQFODUwR4T6XbfVt9NzmlFKy d8X4Qf3EVFXEzKX7/GEQ9Va/jTiitbNWTVbfrYDegsAfruMcVSneuAaqlps26OZuB03d vLGw66+k+xgnWkRzidhtJyL97e31DcVhEZmG718UETol0kYEjegW/t1Y6sXnNyeS6958 HcQ3swP0wF02uTmkOxviN8hHTnh5DOda0yYPJTB5W5xsqs6Gp4whgXypqh166q1efMIk iaU+d4/ehLzH5Y3w+CaBsCe56cHRpPQWISMhtjgy4Hl69b+ePAyzi300oWic1CQHzpV7 eBoA== 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; bh=iCaF16n77f+jOeJM3nvILaH3fA6e7TfASDXae7sIWUE=; b=MGRdl6osdLsfeFCdX4p66FzLPBgsLbBAVW2PZPLJjKfQxKCdYDWpz7GCA7Rhe3w2Ku yE/vUJMtQwi790rC/axBLZrgZSwenEp4za+ooJaQGPgn8A4gMn5UakIzoPtX1DOO7ujr xdVm3WMo9r7E5PEjUnPsE8Cv+mqEcBm35q/codjR3HuxOO98atPxfiLJ3JUYxSXspGGU MczREbvBWlo1orotUHvGqQSlZ06nWZn1J2ftVXds5OJEIw+9s24tquistS4gDs1j+OuV terv/p3UwKlZWgQ8ypBSgBYI73VfUH67YnK3/jq+C6annpGheHBoZZQ4w8A8iQqKBGrn ND0A== X-Gm-Message-State: AGRZ1gIIq3OlUJeR4L8ZqRgARukiSqoq7FvRRsC8H5G3SLbhM1f0B/YL VgcCH92l5RdINRjpWwBQz8hKYxg5 X-Google-Smtp-Source: AJdET5dINzxWVAMqPl+0b3QAXOiNNHMRO91bSGhqszEf6FxE1KfKkxdVZ+VOB9NfEvlSAK/eCyOaKQ== X-Received: by 2002:a63:5026:: with SMTP id e38mr14648882pgb.123.1540877099173; Mon, 29 Oct 2018 22:24:59 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m19-v6sm21848217pgv.93.2018.10.29.22.24.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 22:24:58 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Oct 2018 13:24:53 +0800 Message-Id: <1540877093-25385-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] vaapi_encode: fix slices number check. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix slice number check logic. Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 2fe8501..bf8f37b 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1571,7 +1571,7 @@ static av_cold int vaapi_encode_init_slice_structure(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (ctx->nb_slices > avctx->slices) { + if (ctx->nb_slices < avctx->slices) { av_log(avctx, AV_LOG_WARNING, "Slice count rounded up to " "%d (from %d) due to driver constraints on slice " "structure.\n", ctx->nb_slices, avctx->slices);