From patchwork Mon Jul 31 11:50:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 4530 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp2311667vsb; Mon, 31 Jul 2017 04:50:30 -0700 (PDT) X-Received: by 10.28.67.68 with SMTP id q65mr10807171wma.159.1501501830320; Mon, 31 Jul 2017 04:50:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501501830; cv=none; d=google.com; s=arc-20160816; b=eVOWuen3FKCycuQP4vOHEf8SYSsTyg7OLA8RAm5yoc/lmwKDWpXAbmrVvfwMpJpQxo 3TyHtxWMACqpLabG2fA5VoQx0NCtV2fBEmzHRz7NcIG5UZSNQTRJgFNsu3shKXpuuhnV wG79rzoGGbfb2+DQ/KgL+9VVLY2v/liCmDqaGvBhn7HuoX3ay2zKcnc5IGkjbXPwi37z 5ArUwqLyCuzncrGmVAiNmUlFUOzqlnJrrdgGkPMVBI5NOni0ZdpD6XZXfFjyTKtZ/600 XXLMpyCGxD3+j9LQMi0FIAPjdSWB034EgwMefS8hdHed0M3dN1kgNFWFe5WpxtFgUOy9 kOVg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=XFTcaPDMaLLVFlgs3DxS6Xge7nRSwyEvJ2IFVJqwl/I=; b=mdop5z9h+8L1a79xlWeh+CKkA4df6gI3+lSzpPh3mJxJsWjCfIAXFnE6RlT1VH/L8R 7/6ueTZiuVDZmBdCNAycy6Rb4pUDYVHdThB2vrQPlefjx3nUzMf4Fc1yJzOS7ns3lG0U ccUkQpnPeeVLhyGRFNcRmKLswcfo+zaBiu4+3pqT4f6fbw7kMxa2Dz2i6QdAVUkcpbII 5dYq0rwY2H/qsdUtrkzwxvYF4bzQKfcsrUnl2a3DcDzBE3J80tMjEgBaDJh97xMYBUJy fNdhbv7pEkSnv4eTqbT1pOjIpU0L9dhUcPiW6xPA2GmkKgyByw3gFs30/+/JKjCDO2GF r8Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=JVX8hu3o; 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 i190si384013wmd.225.2017.07.31.04.50.29; Mon, 31 Jul 2017 04:50:30 -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=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=JVX8hu3o; 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 D59B768975C; Mon, 31 Jul 2017 14:50:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEB2B680287 for ; Mon, 31 Jul 2017 14:50:18 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id d40so6259892wma.3 for ; Mon, 31 Jul 2017 04:50:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id; bh=+ld7fAVAnj0/fMcHfwh9q99Acs63kGm8sUuyZhHD3aA=; b=JVX8hu3oMGWzWPlXrd0B9fO3orEyVtWWvJmFt4Oy/SkrXgPUtPUcAzrRrQ2rmdJxav kbdRDf/zJ0zNdxvUCn/0q4e+dgXjg51lCHw2A+B/b03oS9+Fg/6owBcAlSiAls1g321S r1c7qLTSHne65Q85K9sgzPqCQYBC8aBHcLtCdK8bpGqLvSlcGig+76fJlRsgobhD8SkJ 9jBMpf2j7jyoOjyzc1dzhgcuBAhqjDv1wAbEeL5sKUk0p0Cxq99CzLTDjQBA3HlM/Bxm CIKSJ02PrwVtAxk040nr2wgBrqISI1vlGEtsN4nz9IjKXd8fSaqqaxh5ZB71zTuXewsm hTHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=+ld7fAVAnj0/fMcHfwh9q99Acs63kGm8sUuyZhHD3aA=; b=lflrieQsWsRogQFoTGMkFVTXN76u5B9LGx7z9qO4rPY6FLAjZQ1ozDduMZOv3ae9KS fhGnbPv5cLtAPpqhuaZC+XdrvwFYId6xXLlnuUYpeANnPv6/YvzocSsqNPyXlO0nDk7O ft7NamAW1QrlZvnMVzaXd2CBYMsk3vazz/rH3HiS0mArlm+ZRm8Pl+kqgqZzeUxVsRZk lU8AA1Mbw2W+8sGnHMEsZHyAYTS3NKuI8q1gx9OQGaj+Uk+VIWNRHsyUJIuTS4LUigCW ep3BtxeDICTEEtLWIhSWVPp9CKGYdXrM9MKJUixfE6kt69+2egjTN24CJTvsrRAWGHcj Wqxw== X-Gm-Message-State: AIVw112sXS+FYEtzSUIiuVUBN+bq0DHBHohK5baHjxG0ND72WOfmDMlv 4Mw/HOfVUa8hrrPELBM= X-Received: by 10.80.175.99 with SMTP id g90mr13607421edd.190.1501501820678; Mon, 31 Jul 2017 04:50:20 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id m53sm14830400edc.29.2017.07.31.04.50.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 04:50:20 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 31 Jul 2017 13:50:14 +0200 Message-Id: <20170731115016.6854-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/vc2enc: correct the returned error code for invalid options 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/vc2enc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 96e27d93ed..7e0cb03eff 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1114,13 +1114,13 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) if ((s->slice_width & (s->slice_width - 1)) || (s->slice_height & (s->slice_height - 1))) { av_log(avctx, AV_LOG_ERROR, "Slice size is not a power of two!\n"); - return AVERROR_UNKNOWN; + return AVERROR(EINVAL); } if ((s->slice_width > avctx->width) || (s->slice_height > avctx->height)) { av_log(avctx, AV_LOG_ERROR, "Slice size is bigger than the image!\n"); - return AVERROR_UNKNOWN; + return AVERROR(EINVAL); } if (s->base_vf <= 0) { @@ -1130,7 +1130,7 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) } else { av_log(avctx, AV_LOG_WARNING, "Given format does not strictly comply with " "the specifications, decrease strictness to use it.\n"); - return AVERROR_UNKNOWN; + return AVERROR(EINVAL); } } else { av_log(avctx, AV_LOG_INFO, "Selected base video format = %i (%s)\n",