From patchwork Thu Sep 21 13:52:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 5225 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1981278jaa; Thu, 21 Sep 2017 07:01:34 -0700 (PDT) X-Received: by 10.223.142.83 with SMTP id n77mr1934703wrb.108.1506002494431; Thu, 21 Sep 2017 07:01:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506002494; cv=none; d=google.com; s=arc-20160816; b=aU1CIXpsFcQaEugPKTnZ7RTCX9EqionJDkEdsOqokgGloGYfE0aBwBpMN2jXlUa9P2 VqzEwRd4MZChGVK5c2axocF2k6zwHPjKqlSGQqBx5DYiRbkFOijNnTuzMe8/QbzEER6O KaI3Nkxk+dnmt8nz917w2jODZH3xUMPEkhmnCpikjs8qMVJSPPG8bBTusK7frycwpazO Zm1jn8u9OPZX9jxFUDIt/QsnMzFK4uiUURrTJw+yci6yukmWik1PCfJgGACKkd00Tqsz 6b5CueWn7BfrSLgfl6HC9kE8twrOVWM9+2I/3IGSTgircm2MwD2CYSso4abJLkk3zJFD s6rA== 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: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:dkim-signature:delivered-to:arc-authentication-results; bh=xGbYuSEG+F7keAeC/LgDkypGycVcOOoe2EBE21YbpLI=; b=YBFC+0d62yIAL/CoqkI0cEfPHDijbJddmLv3/heMr7sQIBEpffi/TgDG+Q7nRHW5j6 katQMxkYVF/g4hcxpNyPiQpjn9EUCPYD7irMMzg5J8Tnxeehe26Glg9nXtI/Qil5SBV8 LLFI4tpfIIXOYsDXlbRIgn7BYbqE1rFtx+9BvXjk6UjHHz3C5n/UIjomyTonGSuMEuyq 86A8+GF9N2h3r6QFmKS7xTCuNlShMWIhxNM9yXVy65aWL5tJ3YmRThL2F0VGg3t6Ug5f A0ntUdHxSO4O4AjblyWumEKaZpDmT1SKPYaoImivqmkqe664enrIYEOxSdaz3LYvHrAF OrcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=a1yv2Zuk; 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 j19si1138445wre.20.2017.09.21.07.01.33; Thu, 21 Sep 2017 07:01:34 -0700 (PDT) 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=a1yv2Zuk; 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 1737B6891FC; Thu, 21 Sep 2017 17:01:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88409688331 for ; Thu, 21 Sep 2017 17:01:17 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id p37so3197943wrb.5 for ; Thu, 21 Sep 2017 07:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=mzZJvFo7KcoaQhx/9jx8JewrEYR7cfgNmAG0T0gn3SY=; b=a1yv2Zukhvlp6aOmMwF9zwQA38eYJUE2xTkPLVzphI5c/L1lXmg1nH7GNc1ur218nC jDgXXxzzyHUDkgmuY6ez3gLe21XV+T4SIH1iIUHjFIdygea5IdIWgCWIreJ1AFStfpeS pBWCWG7lv4Yhvl7oaaWnrtneIy+SqVaQL4A4DpjmYlTRj12lvSPpTGvstgyIS5cYEJCH adL7od0EO7uOt11Y8ZN8iockIugoYZYM81Ki3AA22tca8Rc2estEAbN3GOV0sF+sVfYG hjAg2LgcPUV+wNyGhXg0sshz3NmlfnmDt3mebCv2axQxL5cpb+5WgvMlnrG1srlwbgQz usVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=mzZJvFo7KcoaQhx/9jx8JewrEYR7cfgNmAG0T0gn3SY=; b=qprjrY0XLwm+r968Euk4NBbyAcaV9XFX3mwZUENqJ+7vWea+U8EuF9/x5+xecNCCvh alcH6UIzMIXI02n3q5C1ha68GH8vrEk8KAn8aDHIITAWogvh6Z6qV/Tidwt//4OIbq7o qWUTgS+2+/myR6Y1/4Zx0xLpuEGG82Flczr61whY5LEmPZBf1w/yMvJoFiTby2DRjmdh Tac4mYIishZENC2qQHzCfAVS0bnoZLDc312CLY6JQULqAAcIjEnfMTtOxzxXhGKgM9M2 Kko2mvEo5l2QB0h7WO+FjPx1sJ2gIZdW6ra0WgXosIR5xQz2KVdraxKrJApOT9AxnerW Fktw== X-Gm-Message-State: AHPjjUiS1GX7gYHTL/arV6yoSDRH/TsmnOo0fyaPW9noptxzXV1MRzn0 BVZ+eABUMeviebIQXviZtjeSfjM= X-Google-Smtp-Source: AOwi7QCraPU+QetnHeU+VlthIdqsnAZYOjU5/ncavAJVS1AzvkhM+R0KIzCdcRVZSOnBsuvYLHrpVQ== X-Received: by 10.223.195.37 with SMTP id n34mr1939984wrf.219.1506001982180; Thu, 21 Sep 2017 06:53:02 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea9000095b705df317edf.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:95:b705:df31:7edf]) by smtp.gmail.com with ESMTPSA id l15sm2363096wmd.23.2017.09.21.06.53.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 06:53:01 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Sep 2017 15:52:50 +0200 Message-Id: <20170921135250.716-4-robux4@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170921135250.716-1-robux4@gmail.com> References: <20170921135250.716-1-robux4@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] qsvenc: use 'else' on exclusive 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index bbf72e54b0..806cef5633 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1048,7 +1048,7 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, if (ret > 0) ff_qsv_print_warning(avctx, ret, "Warning during encoding"); - if (ret < 0) { + else if (ret < 0) { qsv_packet_release(&qsv_pkt); return (ret == MFX_ERR_MORE_DATA) ? 0 : ff_qsv_print_error(avctx, ret, "Error during encoding");