From patchwork Sat Jun 18 20:03:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36324 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp824997pzb; Sat, 18 Jun 2022 13:03:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s2mnqGeYOrxPD9WtEl6EXkXy0AanHQzYcvcULjatyawUGl/bcnYX1n4h25SUGd9jir3tT0 X-Received: by 2002:a17:906:33cc:b0:711:609f:8a63 with SMTP id w12-20020a17090633cc00b00711609f8a63mr14820593eja.128.1655582597773; Sat, 18 Jun 2022 13:03:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655582597; cv=none; d=google.com; s=arc-20160816; b=S2NZCRK3DaymB+g4sYFBiRrTg9gSxR3FnL7OGYuYN3npJc+kx9o65soOV5SK4TEPLp 7caQGKh0ip6N6v+76rgRCiOZHARm3AD3IN/PNdSswKNBNLA+YlJG9wBGEv+RztDaOCf8 kcpT3/HB18+g7cMpLbKJZ1qwgCBon4K3df7QwfGmwxRcKfsxHmIQDuBfo0+1972b8npu gAEwadUvkdc9BDaZObCHkadIkE8Nrw4BWQ/3KFH3K4zqgIALRQDRkRoYMsY6U5+rszIj BKoq4W2ulYlCJtZAjMjGMiTanwLgnZKjaAMZyt8l9srFzKKyKssEwcSkyBqrZdacD+4+ yjug== 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=B8KeNL0ExYJmm3f/fxXVaN4x3/RrufcDJeZAsTymI1md5BoLwF/dTyv5ixATKRoHMK IXfCbSl1Hidggd+QLT/qG8oUCtYGhFw1s42wdECfTlXyGPA0XOhILuD2PTfRa2nwcZY4 J2vW57ilOka7WTO435BHF9OdW01FTohUGPQDQEoEC55mGo/QrqF3x2gmFbPEUQfBxe83 5WXJU4ndLsBqat05Gs76MnLbWrtNsEvICqkJE2r5+HCHbd/Q4oYDcdOL9U6o3qIEj1dk pyu8+iclOErrS89QMyGrvtLJJV1sO7XnUekzgQcfdzO/NfQT+l4mXpDuaGDwRmBh/VVF B02A== 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 gs20-20020a1709072d1400b0070f1426c37asi9498074ejc.464.2022.06.18.13.03.15; Sat, 18 Jun 2022 13:03:17 -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 ECF6968B4FD; Sat, 18 Jun 2022 23:03:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F10568B2B5 for ; Sat, 18 Jun 2022 23:03:05 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o2eeu-0078Ll-8C for ffmpeg-devel@ffmpeg.org; Sat, 18 Jun 2022 22:03:04 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 2eehoZoK38s8U2eeuolqy8; Sat, 18 Jun 2022 22:03:04 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 2eeuodpdUOPqF2eeuoqyeM; Sat, 18 Jun 2022 22:03:04 +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=62ae2f78 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 22:03:02 +0200 Message-Id: <20220618200303.17054-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220618200303.17054-1-michael@niedermayer.cc> References: <20220618200303.17054-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNCC2MwsRurECCjzTRhZ1Lw+8vUlVZ3RRvEuU0pdBzIicAwsaSpM8ze6mtzVRh2e3SNnRiIlU4zDEFQEdBCiULGTLU2vSMFwWjxNLFUzrp4rveibcr0O mxe77xC4d30E4qyu4AUOJk/1nmF5hF96AMc+ESvFZhboYFdoZHKIrf/t3CwIpmlYzSuM5/sGfLrsGQ== 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: mYYngzc2GMoS 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;