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 4E27E4D0E2 for ; Mon, 17 Feb 2025 13:25:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D391268B8E6; Mon, 17 Feb 2025 15:25:31 +0200 (EET) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1710568BBD3 for ; Mon, 17 Feb 2025 15:25:26 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e04064af07so3164530a12.0 for ; Mon, 17 Feb 2025 05:25:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739798725; x=1740403525; 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=qhD989w6kzwI6C7I+dD0/I/YclLcCipGBHP2sIGi1qI=; b=GDUKmrOi5ctSGwe2HBBrOomSToxAcCEbLcCUpFvPRpZMgBTKXFCz/HNI+iZO5NXniu Y52A5jJV7haXzEWNnzep1VKrXS5vieW58fpOBrqn5CjhvHJ4H54XPKW+xtoU50zmN4PA PP69y/Dsq9yoJ+A9hfu7IZjy+6IQNQAC+lyNrei+8U0beEv2GVcV41cT2hS2SaTJMRlP L2OpkYmhZE9DVBsEBqiSuVfcCaWxllIp6WimOt0YBNzOJIZA1WWnf4P0E6HY41fueW52 qss4sLjD3bW9ak6s7zn6rI1aqKQJSgJ2htzhosVFsg1hm4y311sy9QN3TnclzZT1ZK1t qhkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739798725; x=1740403525; 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=qhD989w6kzwI6C7I+dD0/I/YclLcCipGBHP2sIGi1qI=; b=eN0YXsXbVugw4xeHJ/HBiOwzaMja1me+bM/qN1kFwAh8XX16rQRC5nUP30Qiy6QmnY WfUUGT6cy7UkSat48THPQRdrll+d0974D7hntUMBEcl/elzX7LLz44bNWulT1cfrYcx+ LGn5M/77UkYshufvf6zX4q2FMTkSxSzdh3gXONiQKxCeHQi/jSQyCFt7FDq5nMT76v7c 3Bmp30wELNaP1GIza0vmry3oKY4wMFuI+PmsWgfQgkt8Ge00F1byrluRcU4ldL/4DwpB RqecyeEx4kFNd2sa90jdmESWypzpPDsbho9o4/Any09zmWKT4hqhPkkYTooEfbIJQ+Dq oRdA== X-Gm-Message-State: AOJu0Yxj2Bxx5QcQM/uiEpe9/NUw1Os6eBRv6MqTDbTTuzVi0xWzuUWj gymW/AvtfK+NwmdYcqZ06a5U4GIMt62tiPM7aWUpJ/Ir2XEu7E/4CKppYQ== X-Gm-Gg: ASbGncuo2NJtTFsb+ZjsoWJmS5xxNGR8/d2Ag4psdxQu9vM6ew6MREmAFrO+UPKFm9F 3wHO5oXa6uHxJxDcW2GtiOndoRrpUbyV7hWDHOkN7nWDtFfnPCh59RnPGVO2N1o56k6xRoCYo/Y LD9KFcbl88pmKwjAvOQaF2iDpp/NV2qVkZAltweLkbmPXue5fjbw3YwuDfnUrdthBevMa2wYdIj /xa8rQlb/RVkb+XJBXRbx3/giR9kKYhWRqBLRUvAaUYFMtK8vOb0tKJ4k9h35f/2liTJT5yGHbz HNtGVHU1p6ENKdnN3hEIcY/phDPvLBzVeZSadIe2pDEVOyV5NH+9ESlFRK7CYoFY460R0PF2Eqd YK4hLHnTKE2zD+7hvpug7+5xJvw== X-Google-Smtp-Source: AGHT+IGe07AW29Bcw6shGvzHQVNV5QpTSSg2+YlsGhcp+RtFYmj4WSPelTpG+8btGe3i4pCGf2u7rQ== X-Received: by 2002:a05:6402:2548:b0:5e0:3567:8077 with SMTP id 4fb4d7f45d1cf-5e0360440abmr8598588a12.4.1739798724965; Mon, 17 Feb 2025 05:25: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 4fb4d7f45d1cf-5dece1c46b3sm7283436a12.21.2025.02.17.05.25.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 05:25:24 -0800 (PST) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 14:25:20 +0100 Message-ID: <20250217132522.829177-1-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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 --- 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".