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 AC3544CA97 for ; Tue, 11 Feb 2025 07:25:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 960BB68BC65; Tue, 11 Feb 2025 09:25:03 +0200 (EET) Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7361068B6B9 for ; Tue, 11 Feb 2025 09:24:57 +0200 (EET) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-ab7c81b8681so255475166b.0 for ; Mon, 10 Feb 2025 23:24:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739258697; x=1739863497; 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=7Aax/PvhM+oG3zY3M53E4rQvEpHq12L1i9vcbFYJpPU=; b=lNOwexTfqafNWK3TuW7OTo2tUAdK2DPygUvpYVtEGvyh5CkXUF7dxCiGgbZtM4KuuI WdUwcxETPosSdNa14aKySjLu+VOW4UBCG/jlekAHixEmoAGHpJt3zK6NpJS8jqsrItGv 67g1fcgqQ4l+zw7tZYs4M6PNrAldGxPE67LAkc4S33K6hTvT35E6k60yCQpa7/AP3vvt X3RsnvYoSDP4WbKNzS41O6bL5J0I2V8jdcK9fmUo+uWjxIqOhc1DA4YstiF71Sn8FOsq b6t+pCeCM77Cz2bN+V7KH7xeC4LeoRypeCIQcJ56hEfvmMjpYPz27vGEW3Hk1I2LDfNa wyfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739258697; x=1739863497; 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=7Aax/PvhM+oG3zY3M53E4rQvEpHq12L1i9vcbFYJpPU=; b=Xn40jPJwvM/PWEutAVfURtxX3olE0OUrCuMxw0N5fWaMF6zmvkZhUMOuidYJEyhr0F 35oSFHVyw98LrtUEuQhikkEsnv5YaW3BqKW1fK0YIT80pYvItApJLDhqiKiZs5Vgn3/T qXZiMP1wmv3nurKTQq3VPvramXDyzo0B3JJOPZwLgeReT/YqYp8Z3dzGscWsmC43XKXs HHFDzU8Iimtx6A2qFTE9OaeJClCL7Lcu4FcPeOsTuNkxAPwscos7TCVpLqNb6r3dPHYM DuCH7K2iY6Gj8bl8CuioAZlAXCL7gYBwHFUwxyqhycDnoy/vNO0BBamDTKi1SPYvPQEk 1apg== X-Gm-Message-State: AOJu0Yz5PFNA6VWYbJKCNMU9eUAVYChD0aXSIE8nrMcuX7laJ5kWQI+k jNaeG7Ee/BvBv9/ruRztm7t9IueSB/GIPpmwrJqsEgzVcNLOwEeCkxUd0g== X-Gm-Gg: ASbGnctWqYtDd6brooPqI0WJVGCQEdfa4feAMiWbL24QE9kxQE5Ar387lquLfUWbT71 4HqbbTe2dRkulGn7TEkAJ2vFyRGSoYRjS7iDH/FaPBvdNou7Ia4SuaJnYn3N7mYZv7x0+K+eSaG AACCT1z6xpIkXReWkY+RfI8tvszN7yMnnErfGdvh8SCpICjg5jv2PaU5jWyMY6sG6B9fuel7SGO sbxFYOPHN//reDIaczg84DfLLl4fR7qvWj4MJFCL2U75vD41LydPaGI3skO3Ejw4+AwHJaeAIMi JL0wsDx9D12Flc+jj49xIJB4ZFl6mf/W+Y608Rvg95mFR1u7Rtcy9+bgB/lAMR4UmRWpTiqWfwN 64ZHe5Mbbv/Xdd2rEvAIpD7uHiA== X-Google-Smtp-Source: AGHT+IHVtV5Ili3rawTRoNBSe9TG0LYaK54JsLLuOS8KiS9c+8izsFO9E9TvebcU+LKSyJc9xijKDg== X-Received: by 2002:a17:907:60d6:b0:ab6:d47a:9b20 with SMTP id a640c23a62f3a-ab7da399baemr253456966b.31.1739258696403; Mon, 10 Feb 2025 23:24:56 -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 a640c23a62f3a-ab7cbc313c5sm255326666b.150.2025.02.10.23.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 23:24:55 -0800 (PST) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Tue, 11 Feb 2025 08:24:47 +0100 Message-ID: <20250211072449.7100-1-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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. Mark the frame as corrupt though since we werent' able to decode everything that is supposed to be visible. Signed-off-by: Manuel Lauss --- 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".