From patchwork Thu Mar 9 09:49:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 2853 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp252251vsy; Thu, 9 Mar 2017 01:50:01 -0800 (PST) X-Received: by 10.223.175.15 with SMTP id z15mr11075829wrc.84.1489053001155; Thu, 09 Mar 2017 01:50:01 -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 w130si3574668wmf.134.2017.03.09.01.50.00; Thu, 09 Mar 2017 01:50:01 -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 DC68168833C; Thu, 9 Mar 2017 11:49:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22993688314 for ; Thu, 9 Mar 2017 11:49:31 +0200 (EET) Received: from paradise.fritz.box.fritz.box ([80.144.14.140]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MTTKZ-1ceWK722Uh-00SOgy; Thu, 09 Mar 2017 10:49:44 +0100 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Thu, 9 Mar 2017 10:49:34 +0100 Message-Id: <5f307fbdc6cc95abbcf1dc38b9d5b3b2066d31e5.1488989980.git.barsnick@gmx.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K0:5pBeKb/Mf1FkJI3R6kKCOS6GzYzwxPmJM4eCKKcyHtzzEk2IrXb uqP0mMXwUfUs65QhqVFAYv/xCidZBCpsz25Q+Im/xMLp+urMNJpyZwqnsB+VtzYMsO/q+/X R6hdJZdhzGCBdg35CBuzE2txiAvYfJdiQpLz0hGOKVsO8yYT5Z0LrkKOvH+CWYalrq1QFam yqr0YY5Hi9ldq/sBlElFg== X-UI-Out-Filterresults: notjunk:1; V01:K0:qgvL0eb8BHM=:DqR0Q54AIsqjNuP7gavBVK H/lYqzKQPvDDVj4U63dalw6bABX6bOf3mEIhbjsJMsEQ1UPJfMBba1ZplFm3TrepBO2v5BqSi X3JQgY6EaOxgkITM208nNkHpBq3BSI8BpDES0WMD9bzxfCxTEqSXT2Y0R55BCi3Pk0uF+Uf1k VejffbgpiKZUlkXZ4kGR4gAZq3+6Mw7p5pZ8tsQH2AoFujvChX9wnUYcVShr7AL+qaA+k2BAJ i2i4HFzSii/9TojChDml9WkoLjv9XExnFO3PTNxG879uB2IPlqDRUdShFZ5exODvuqSM959C2 UbY4j1Jz8tUPqjh3Jf6xkpHVRnkSlnpU4ZgtFF450Ik6yE7l5aCDQ+5IRo04ZtPQVkA7/S74j KbGn1ACQsj8S0mUCIHMRZI5nDamUc693cVH0cLoxSi5Ll/d3Rb1ZlKrsyloNq1DlUBnR0ehkG tGCyr5xREBNNZ5r89NYApHRHFWL6oSQe66rRIjMJ2j+J+zieWBS+lN48NtVnSBkporW3m2mrV uCLFvHXKfkcHNPPT8OqrFBypPRAmnFmgKH0Tsu42AXW9eAWYowQvu61ryDPzxTa4Zje5LRA1K iGmjNL0Lnd01XZgi7Gb5uXhJP53QpGCN7H+mmnAOJM1PG7MRI5Z3u+CSgq1stlvLp0bKEDJpW A6tgFMcr0XIsKDKd6/2EHFKkbcV0msZiAgDLgU+4cq7+U/TWx9Sx8VSmH3CDL6WzdPmL9xmT9 V1kJIdSeoxgU/tZczWmQRsc2dzZfUVo05vteUefZ+pTqiRUMZTmyuHZO/Ss= Subject: [FFmpeg-devel] [PATCH 1/2] lavc/libfdk-aacenc: make message clearer about action taken 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: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" A user option is being checked and adjusted, don't just warn about about the failed range check, but also mention the adjustment. Signed-off-by: Moritz Barsnick --- libavcodec/libfdk-aacenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 98a817b..5f84fb2 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -185,11 +185,12 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) } if (avctx->flags & AV_CODEC_FLAG_QSCALE || s->vbr) { - int mode = s->vbr ? s->vbr : avctx->global_quality; + int modenew, mode = s->vbr ? s->vbr : avctx->global_quality; if (mode < 1 || mode > 5) { + modenew = av_clip(mode, 1, 5); av_log(avctx, AV_LOG_WARNING, - "VBR quality %d out of range, should be 1-5\n", mode); - mode = av_clip(mode, 1, 5); + "VBR quality %d is out of range, should be 1-5, using %d\n", mode, modenew); + mode = modenew; } av_log(avctx, AV_LOG_WARNING, "Note, the VBR setting is unsupported and only works with "