From patchwork Wed Nov 9 19:02:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 1362 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp449684vsb; Wed, 9 Nov 2016 11:02:51 -0800 (PST) X-Received: by 10.28.16.70 with SMTP id 67mr1847772wmq.53.1478718171545; Wed, 09 Nov 2016 11:02:51 -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 m9si16221374wma.52.2016.11.09.11.02.51; Wed, 09 Nov 2016 11:02:51 -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=@mail.de; 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 dis=NONE) header.from=mail.de Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60EF8689DE9; Wed, 9 Nov 2016 21:02:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout01.mail.de (shout01.mail.de [213.128.151.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96356689A87 for ; Wed, 9 Nov 2016 21:02:39 +0200 (EET) Received: from postfix02.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout01.mail.de (Postfix) with ESMTP id 7115B3FF6C for ; Wed, 9 Nov 2016 20:02:42 +0100 (CET) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix02.mail.de (Postfix) with ESMTP id 5B835C01E2 for ; Wed, 9 Nov 2016 20:02:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde201610; t=1478718162; bh=sgf3WgBU/SoBZ5fiDj7CcFfH39+qzPISU0lELvbtE84=; h=To:From:Subject:Date:From; b=SmeeJCOWF9uv54AMlIs2nDq0xWwaya857k7LCYPt/EsBtmaOBswZYECSzVMGr5QVn Kxb1H9u+d8CMYa74JhS+5Nv4XXFITGaPqtmfMC2apzZk1+3ft+ZlwtE1yAHoix/kwY YtPD+k1WDesw1SkbwuTEo/npQfx6jvKDx0gSbprs= Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id 37AF080094 for ; Wed, 9 Nov 2016 20:02:42 +0100 (CET) To: FFmpeg development discussions and patches From: Thilo Borgmann Message-ID: <582372D1.6060501@mail.de> Date: Wed, 9 Nov 2016 20:02:41 +0100 MIME-Version: 1.0 X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 2027 X-purgate-ID: 154282::1478718162-00000836-A52DE865/0/0 Subject: [FFmpeg-devel] [PATCH] lavc/alsdec: allow for predictor orders higher than block length which is valid in ALS. 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" Hi, fixes ticket #5297 reverting an old commit. -Thilo From 50f62f88696d1401d93c552d52fe1b9c396f8a00 Mon Sep 17 00:00:00 2001 From: Thilo Borgmann Date: Wed, 9 Nov 2016 20:00:02 +0100 Subject: [PATCH] lavc/alsdec: allow for predictor orders higher than block length which is valid in ALS. Reverts: 18f94df8af04f2c02a25a7dec512289feff6517f Fixes ticket #5297 --- libavcodec/alsdec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 3986347..2b2273e 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -705,11 +705,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) } else { *bd->opt_order = sconf->max_order; } - if (*bd->opt_order > bd->block_length) { - *bd->opt_order = bd->block_length; - av_log(avctx, AV_LOG_ERROR, "Predictor order too large.\n"); - return AVERROR_INVALIDDATA; - } + opt_order = *bd->opt_order; if (opt_order) {