From patchwork Tue Jul 3 10:51:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 9592 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp966771jad; Tue, 3 Jul 2018 03:51:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe6WdyW250cUkqFCSNsPCeyj3GkXFOT7V3lYzwzKaMBKbm6a9Hq8eFYp07gD1j+rxOZ2sIr X-Received: by 2002:adf:f188:: with SMTP id h8-v6mr17844230wro.214.1530615094962; Tue, 03 Jul 2018 03:51:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530615094; cv=none; d=google.com; s=arc-20160816; b=Duo3tofATB0Q5cIO4yLjamaVPCBeoRb5qf4oYCq2mACzDcw6wokkeu92JgRy0t2lTa HOMQUmhuHrGpBGndsck5JEZX+v+C/k9eMsOwGjE+xjU7KG8Rw7e1FeE6tEZ44g1UTajY yVKnWCpxXPcyFYwJsnDRybFxXL0lznrZFx6EBlIsmslZA8iaPjzKmfNiaLkMG0tuEfct kjrBFVC5cnhBQ3t+sYHNw5ymwck0MzED5+l4jGoyJuEgaS2BHIQuP1j5jfF8LM24PPgr lDeraOrue57x7tVINBsf+dSCaxviIDChbMY/XFjyl8lM7nV2FJIumz6ueYhAxEQJEMw+ B5Ow== 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:cc: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:delivered-to:arc-authentication-results; bh=zsqX4j/i8+/pZEGx52x+22ziK7yNqvxdG/v6hDCAL7g=; b=IMDE7ZpqMXLC9gK6ZcKQZ6q2sS08aOdr2785ysN78/G5xI9viJ+i7GiX3DIHKu6/u5 RoJQqsNK8WLtcWzeWIe/SqW5gFnRx6EE8uG65Fo/9AJ2QQRYCUJKs5hB0+yZ5anywXc3 hCJ63p6q8IjYbkY5RR442WuwOWf5jBdZ6Pf8Afa1bxEsmY+6pj1dS24BdpPwR5hUGQJL 8Ibr4KWw7vv90OqY1e09OB6vXwbhr+/QqMTPPDVXdnQnTnCXnYzR0GGKDtNBKRynJplW mRtDiLsHCRFZw/gMScapL+WdhNqtjPeaO3rD4Z+x9J4gAkQV2cDCzRij64WtaF3p0t7M Vf/g== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o83-v6si806295wmo.206.2018.07.03.03.51.34; Tue, 03 Jul 2018 03:51: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; 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 BF58B68A8AC; Tue, 3 Jul 2018 13:51:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6EDEB68A8AB for ; Tue, 3 Jul 2018 13:51:15 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 6D51EE04CB; Tue, 3 Jul 2018 12:51:19 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hlrXRfpwRJsc; Tue, 3 Jul 2018 12:51:18 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 7914AE049E; Tue, 3 Jul 2018 12:51:18 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jul 2018 12:51:12 +0200 Message-Id: <20180703105112.14814-2-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180703105112.14814-1-cus@passwd.hu> References: <20180703105112.14814-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/internal: increase FF_SANE_NB_CHANNELS to 256 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was reduced from 128 in libav commit 192f1984b1a93aa08af053b8f9ab4950f307bd5d, but since we support unknown channel layouts, we can increase this limit. Fixes ticket #6332. Signed-off-by: Marton Balint --- libavcodec/internal.h | 2 +- libavcodec/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index bb92873d7b..0c2133f092 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -83,7 +83,7 @@ #define FF_QSCALE_TYPE_H264 2 #define FF_QSCALE_TYPE_VP56 3 -#define FF_SANE_NB_CHANNELS 64U +#define FF_SANE_NB_CHANNELS 256U #define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1) diff --git a/libavcodec/version.h b/libavcodec/version.h index 39be9d530e..9f6b0dfe24 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 20 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MICRO 105 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \