From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A1A0F4DE38 for ; Tue, 4 Mar 2025 17:07:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1DBF68EB7B; Tue, 4 Mar 2025 19:07:31 +0200 (EET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84F7768D1C5 for ; Tue, 4 Mar 2025 19:07:25 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43bcbdf79cdso7008825e9.2 for ; Tue, 04 Mar 2025 09:07:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741108045; x=1741712845; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xJJ9NyMPIJF27ThM7s88kYU1fjDGEmNnJGmp8wFszwo=; b=dsnYx0qmVYWd9YMj6Kp+KsI9OV/GAGt/wKzq2dPeqIh7KUXt3mNBUSrhbXuG3NRZUW 00qYJ/A8H+yktdtK/y7Ry5i4ZT+RM8NKQ8OEqkGhpmP8yYjaGTGcI0LzkZ2PZKXXTCsR oqOQ73F/RiomyYfn8ozxZkyERa0l5b/HK2JtyRxpHSBUbX4cRz1npiWt1jqFsBNfmaxd 2KfixZreqS/dDihbA+TKVxn7PZHGBx1oU8bszTKesPt8UUElpm/rdUNat1ANLJ39W/jF Dc4sl+w2WVqnRnmlmao/+zJiABml2OsSzxmqW1NpcNX3PyZwEXn9E4i1um/MOLrXi95e axFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741108045; x=1741712845; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xJJ9NyMPIJF27ThM7s88kYU1fjDGEmNnJGmp8wFszwo=; b=N69aE7CMAB8Fif3EGx9K7A8aAvnklaf/mCGmUbkftektQVWTRS3FE5vRDrY1Vhb59x sv8YuwSL9asU2lDnoMHUws0Bb1yeYJrZQfb13vOns6Dw4HkbeR/ePX2jZPLP4A5GeApR YLps9Ac0Er06d/K8p4natQFARs0vPnYbv1AyNEcuUGCkkHH+TPUIGF5swEVgsOrFLehB /dSTU79Z2OE2VnbWZ5l7SvX/x7lLMeRlBdS3A11Yv677qSPCfmj1xiyNRNtRCAyUGXtr H3+d6R0yjUlJeEgQSJvWAX4928Lyn4r2lqsH/Xrh6kA6YCWxybVUUFFUecKqGyFXsgkR Vxsw== X-Gm-Message-State: AOJu0YwAG8TMGHc+i8Czg57Hn83XAImWQmF80cD8Fg03Fgx5hLvu9p7Y s40U/4HNISYm7uT/LozuA3PN5RUsZP8Scqc/FDa5pmm4nB2rdarLX4qbJQ== X-Gm-Gg: ASbGncviC/aJ5Pv8se/ccGLJG3nwNdSS9SRpaiZrU4Jlv9+xVtbxWhQjIVnsuZKChGi 9Hw0V33gwQZS/7Q2sbd7i4REIFbwG9guKOeFma9gpJYCTR/ww94gbafZlpiI+Q3n5i4xPzNTwkg 36SVItIVAUsxVu97ICG1qMxu5DmkiboOmOu8dMWE+TjQ/eafJmvksV2GM/+0s5pKw6qk2voiqcE 2g6I0mQr/Zm6Q9FjntY0kSRNsgFMM65kx4o87g7tXTmtZsnGoLT0xTT7v5IDP9SuxcBj4uQeLnm emiI4SIxBjny0T1CdC6aiqPThm3Z8nuVg6cPzPhbYHIUNt46CyPzRBZZ/B4QHSaywkKJ0fQczDW 5yhtNasfcnn+QS7H/HAYvhXMOAjP0reswclZiNsYNaRcPMMDWEMLnqAQ= X-Google-Smtp-Source: AGHT+IE3WzIWnnS/+RPWbi0NiIricrdwiuMn18tf6v0MZceSUTMMOl4fcRX1ngg2pB7Meg4/3Dq0Mg== X-Received: by 2002:a5d:64cf:0:b0:38f:4b15:32f1 with SMTP id ffacd0b85a97d-390eca57058mr16314629f8f.54.1741108044462; Tue, 04 Mar 2025 09:07:24 -0800 (PST) Received: from flagship3.deu.mlau.at (p200300c0271f29004c5623f045c27bca.dip0.t-ipconnect.de. [2003:c0:271f:2900:4c56:23f0:45c2:7bca]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e47b6cd8sm17978950f8f.44.2025.03.04.09.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Mar 2025 09:07:23 -0800 (PST) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Mar 2025 18:07:17 +0100 Message-ID: <20250304170719.602196-1-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/3] avcodec/sanm: ignore unknown codecs in FOBJs 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 Cc: Manuel Lauss Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Don't error out, just ignore unknown codec numbers and pretend decode succeeded. This is useful for older LucasArts titles which stack a lot of different FOBJs with different codecs into a single frame. Signed-off-by: Manuel Lauss --- v4: no changes v3: no changes v2: Mark frame as corrupt, suggested by Marton Balint libavcodec/sanm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index c30095ed32..a4f0a28c7c 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -1274,7 +1274,8 @@ static int process_frame_obj(SANMVideoContext *ctx) return old_codec48(ctx, w, h); default: avpriv_request_sample(ctx->avctx, "Subcodec %d", codec); - return AVERROR_PATCHWELCOME; + ctx->frame->flags |= AV_FRAME_FLAG_CORRUPT; + return 0; } } -- 2.48.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".