From patchwork Fri Nov 18 22:06:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1481 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp346921vsb; Fri, 18 Nov 2016 14:07:06 -0800 (PST) X-Received: by 10.28.93.202 with SMTP id r193mr674066wmb.30.1479506826352; Fri, 18 Nov 2016 14:07:06 -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 xb8si9298861wjb.239.2016.11.18.14.07.06; Fri, 18 Nov 2016 14:07:06 -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; dkim=neutral (body hash did not verify) header.i=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B848689D43; Sat, 19 Nov 2016 00:07:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3B28689C4F for ; Sat, 19 Nov 2016 00:06:56 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id m203so10455354wma.3 for ; Fri, 18 Nov 2016 14:06:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=7rqsTRi71MyTMq2r4SLDTkmt65e9twqet/w3MXUjUs8=; b=EN5bzNNX7m4+ujWCfI13p6hewO9pJma7AV8CBVKBym26t3QU0QkNUsPpoYLw+JwGNG AO5II50aG1s3h9AYmNnHKt09pX03XBEoIJAPtc9ykXJXzMQ3Wc5Jk04Gkcebk5/h/P3u GtGSIllpKsmFd421YaCX0d2K8T4bUAi+ZFtN1DZB2T7/RS42edRmZ8sVYDpIpXJbuYV8 RCwiTxgf4CsN6+dIG711zjAWU3g+p0HASuc0kwWtJNSXy6vC5/MHOCBgYmRXS6CKxhhC x/Reo5y5cGhJWvAV62UBtPrWDuDPJ653U/OnxMq3nsN60t7IOu2vnZ67CJLtLCWzfloa Q6Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=7rqsTRi71MyTMq2r4SLDTkmt65e9twqet/w3MXUjUs8=; b=QIibSMzOwOPT3ZpueQ8sGaJAymuPyUZypWu645ITk0cKu82B+nf5tUnYqbRzzorvR/ FsdvYxhfAP6W9UbaMYYyI3w0Ngv7thQFzj5BQ0xFaphq4BHgHQ3foL/BqJoG2V/701uV mBUZb8Xwy7BQ7n1W2UIaN9YP2vBiPgbqbTbgeTuW83BSR8X27rj1WLqVmqX1FHGgMrqn oCS6GIyNJv9VqojFdz6Asu0dog3sjGuNU4U91/NPebS6pW6S7TK3YbKAB948oLRjpPf+ ejBEkz4TDUay4ftZAhC1MqYO0fnbJYAzaX1/Mw6WwMHXIOkeLPIjolHOgN6ENJK4cyr8 rvxA== X-Gm-Message-State: AKaTC017EZuprxZ+5mIfjtzYwyY706qfLUUKP+WbVma4u7E4EewHgIKBtcfu7DqkvuMEsw== X-Received: by 10.28.197.6 with SMTP id v6mr575658wmf.130.1479506817755; Fri, 18 Nov 2016 14:06:57 -0800 (PST) Received: from [192.168.2.21] (p5B07278C.dip0.t-ipconnect.de. [91.7.39.140]) by smtp.googlemail.com with ESMTPSA id b15sm5537645wma.5.2016.11.18.14.06.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Nov 2016 14:06:57 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <6f4937ce-7e05-cc18-b541-5fa31adb0620@googlemail.com> Date: Fri, 18 Nov 2016 23:06:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] options_table: replace INT64_MAX with a sligthly smaller value 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" AVOption.max is a double, which has not enough precision for INT64_MAX. It gets interpreted as INT64_MIN, when converted back to int64_t. Signed-off-by: Andreas Cadhalpun --- libavcodec/options_table.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 48de667..f117ce4 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -41,8 +41,10 @@ #define AV_CODEC_DEFAULT_BITRATE 200*1000 +#define FF_INT64_MAX (INT64_MAX - 0x1000) + static const AVOption avcodec_options[] = { -{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, INT64_MAX, A|V|E}, +{"b", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = AV_CODEC_DEFAULT_BITRATE }, 0, FF_INT64_MAX, A|V|E}, {"ab", "set bitrate (in bits/s)", OFFSET(bit_rate), AV_OPT_TYPE_INT64, {.i64 = 128*1000 }, 0, INT_MAX, A|E}, {"bt", "Set video bitrate tolerance (in bits/s). In 1-pass mode, bitrate tolerance specifies how far " "ratecontrol is willing to deviate from the target average bitrate value. This is not related " @@ -444,11 +446,11 @@ static const AVOption avcodec_options[] = { #if FF_API_PRIVATE_OPT {"min_prediction_order", NULL, OFFSET(min_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, {"max_prediction_order", NULL, OFFSET(max_prediction_order), AV_OPT_TYPE_INT, {.i64 = -1 }, INT_MIN, INT_MAX, A|E}, -{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, INT64_MAX, V|E}, +{"timecode_frame_start", "GOP timecode frame start number, in non-drop-frame format", OFFSET(timecode_frame_start), AV_OPT_TYPE_INT64, {.i64 = -1 }, -1, FF_INT64_MAX, V|E}, #endif {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, -{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|E|D, "channel_layout"}, -{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, INT64_MAX, A|D, "request_channel_layout"}, +{"channel_layout", NULL, OFFSET(channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, FF_INT64_MAX, A|E|D, "channel_layout"}, +{"request_channel_layout", NULL, OFFSET(request_channel_layout), AV_OPT_TYPE_INT64, {.i64 = DEFAULT }, 0, FF_INT64_MAX, A|D, "request_channel_layout"}, {"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E}, {"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E}, {"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D},