From patchwork Sat Jun 18 19:16:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36321 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp810943pzb; Sat, 18 Jun 2022 12:17:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uPFta8ENohHQKIBmtXnTIb8T0uV1V56g9aniUYMvBEk6gMAE5jugPJltYg1G+4M9NDQ+Lx X-Received: by 2002:a17:906:58cb:b0:70a:751c:91fc with SMTP id e11-20020a17090658cb00b0070a751c91fcmr14154057ejs.258.1655579866827; Sat, 18 Jun 2022 12:17:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655579866; cv=none; d=google.com; s=arc-20160816; b=HU/pgb1JaSHOY95rYOQVVBr8GwjEpmfjhaiYvz5Q4WM8UGMpA/HX/uxFpfXt5c5TTU iVMzYlikKKueQP63q8+rPsHAy1X4p2N3KPV2aE8u+oQEXK6zwANA2804E8nITSOOhUWC zBLLyXALKw+SYs8f8/8mTwr0kDfFl13HyYbAEWDHZsGrRc1Dtj/aNzlMdEwv0YwUPyR/ GCB5oFyWgzgt4X5qqAnWV5ULVCmGj2K5XqC/LLna4FVprbKTWjUKcidIAThqLswVfvVv CeYchzwjMTKMDxzdPVMhLPQOJsvxerYKIvnmz6suXr9A1dvpDCM78mzPVlzZ53CUl7bD 6Neg== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=ngLJGDNXqAMH0oB8XbnYqX5v6tYi7yfb7fTp//3xZR0=; b=TxtKqIhJiKq+cl1nGAvuVfbarhhqUKefcLU5g2zjeNDQUt5Soz5kN2FPA02IGgEh8S fkceT4hmjmmZQgO8v7A6clq6BpddFDr5cdmqM79kChHupSex+ergFCiTyv7ebiIxGWs7 WRQP2htPhq12CFhgko9eW/UnRHTzP1xoatgwR+ulSTXznPr39AG+0SQuAOJ8q6Mn5VR1 J21f9EvDc5Zv1c8l53Jbatt/8b8aX044A0ir4fdnVwNNbktfIJYBpYh0OqD6ABfWudxI Ql5d0QUeEjsMQ6gK3N4kVm2MLToiwYFCZKolsAgJrLOg9pkg1lywpW4vLd3QqSqGyCnk fjqw== 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 b12-20020a056402350c00b0042dd46b5a89si6102878edd.243.2022.06.18.12.17.46; Sat, 18 Jun 2022 12:17:46 -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 982E068B579; Sat, 18 Jun 2022 22:17:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73FE868B37F for ; Sat, 18 Jun 2022 22:17:38 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o2dww-002WM3-1g for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 21:17:38 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2dwtoXWAi8s8U2dwwokQgg; Sat, 18 Jun 2022 21:17:38 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 2dvyodUdeOPqF2dvyoqw1L; Sat, 18 Jun 2022 21:16:38 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62ae2496 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=V14U3VdKKzpFb2B2f9wA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 18 Jun 2022 21:16:36 +0200 Message-Id: <20220618191637.16712-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220618191637.16712-1-michael@niedermayer.cc> References: <20220618191637.16712-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEv489bfrr3i25dHhaHkVKbKi33XpnvubnJeJhqeKgxLtQTNMad9ZhyqXqWwmhgWiplqDuypmEYSmQCm4rDGSkQz4Q9cFL4QCHG4w5KkKT+v/LlS5M5Q 0A6Wgx5Ckh9JDzbYG+93NNwZ6qag1QLnAt7Bw23WBF/29L+VsLjMkbSIjFvrcm7VdgH6SPsGPTiIIQ== Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/aasc: Fix indention X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: bGf6d0yKkfxk Signed-off-by: Michael Niedermayer --- libavcodec/aasc.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index d297cfad76..528ee58cdf 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -104,26 +104,26 @@ static int aasc_decode_frame(AVCodecContext *avctx, AVFrame *rframe, ff_msrle_decode(avctx, s->frame, 8, &s->gb); break; case MKTAG('A', 'A', 'S', 'C'): - switch (compr) { - case 0: - stride = (avctx->width * psize + psize) & ~psize; - if (buf_size < stride * avctx->height) + switch (compr) { + case 0: + stride = (avctx->width * psize + psize) & ~psize; + if (buf_size < stride * avctx->height) + return AVERROR_INVALIDDATA; + for (i = avctx->height - 1; i >= 0; i--) { + memcpy(s->frame->data[0] + i * s->frame->linesize[0], buf, avctx->width * psize); + buf += stride; + buf_size -= stride; + } + break; + case 1: + bytestream2_init(&s->gb, buf, buf_size); + ff_msrle_decode(avctx, s->frame, 8, &s->gb); + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); return AVERROR_INVALIDDATA; - for (i = avctx->height - 1; i >= 0; i--) { - memcpy(s->frame->data[0] + i * s->frame->linesize[0], buf, avctx->width * psize); - buf += stride; - buf_size -= stride; } break; - case 1: - bytestream2_init(&s->gb, buf, buf_size); - ff_msrle_decode(avctx, s->frame, 8, &s->gb); - break; - default: - av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); - return AVERROR_INVALIDDATA; - } - break; default: av_log(avctx, AV_LOG_ERROR, "Unknown FourCC: %X\n", avctx->codec_tag); return -1;