From patchwork Wed Jan 24 02:03:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 45756 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1004531pzf; Tue, 23 Jan 2024 18:04:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFFt42otoPIGZ2CNWiZQFY4Hs1M7qG+yji04gP9OsbD8wGZP9Wj+PaEcavlApLk1FjnmfYP X-Received: by 2002:a2e:9592:0:b0:2cf:321:6592 with SMTP id w18-20020a2e9592000000b002cf03216592mr354160ljh.80.1706061885247; Tue, 23 Jan 2024 18:04:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706061885; cv=none; d=google.com; s=arc-20160816; b=ulg+5FyE9gcfIxbcYXXNj4QCkxPE8bjIZvT60Ctri7fcwxBfURPVLpvkyIp3KzEwqe rE2wJa5Mroqr9RS0Cno7r+kNe0cUV4wppBCqn4SzP8+/XoNAPLyiFH+Ur/8sdYtuFA55 /FO/eDkUVpFR6Mm37kE9ZNdZTp7uKO8FqKnwM6g4OA/VOJ74IxxuGQ6SeRgQG4mldcEh zgMfwEbLFO1K3WJFm/PglL8aeqY6ftSjlbrUenohO42Xl+cWGVc18aJKsXlYpPFP7l5X Jf9Kl8Jt2bpUUELdzz1tqiXLATGepG1/LYFO6qEVKfw6JF+qDDRLGLru3DpfmFbIE9X7 9PtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Vn52Ko9jl2bk9oKjTPBeSwAH5QUoCvUZofVcSUY9+E0=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=Lxr2drIfSG8TNeQ0vNxtg/qLrFzVS1QUFTn1hvoR6d4dvf5MQvzJKZ1slj1l7TCEPx HeUZIdQ6OkF2crzpIBYlms5YekKADqsY7vUX7/Ovk0pw+oiYfOQ59SQ3yXMWxLedimhb jnzmA58laGsMBqn4quvHsvRR0A786tHiyj6DWNsN8mKvuAYKm2Oi/+5APwJ9o3bXxt5N rHKDbH4bIJG8j8Q3fjGv+a9TYpjd6fFFOhvsVA0AdtLpy2T3iBeUVxClC7hKH96dN4H0 f/WNeLXjTH4pF7I50gry2sNYlUU0j0aqU1NY1OOpofc0RsNMkNN8qx4frK9yjiGwzrXS 7q4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=NdHaCLdw; 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 fj8-20020a0564022b8800b00559cd2878cdsi7645849edb.14.2024.01.23.18.04.44; Tue, 23 Jan 2024 18:04:45 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=NdHaCLdw; 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 730E468CF90; Wed, 24 Jan 2024 04:04:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f228.google.com (mail-il1-f228.google.com [209.85.166.228]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34C7468CD10 for ; Wed, 24 Jan 2024 04:04:34 +0200 (EET) Received: by mail-il1-f228.google.com with SMTP id e9e14a558f8ab-3619cc9cc65so18787295ab.3 for ; Tue, 23 Jan 2024 18:04:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1706061872; x=1706666672; 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=C0L9bVQh9fFF0oKkjktvDrxFcbSAT9OZP7oq4WTSKm8=; b=NdHaCLdwjwRWmepAcJNGHzAyBrB7JoxsjawvAgZ9KnKUfCtypjznC7Pjauxuyol4LQ lfddwIRB2eXRaPKrpBtkjZJKM8YVULjgVTlGbmVwkWI0WERjxz1GjU7Y/OdB/YUVVWCo kMFwr2lp6eDRUVUTCXsqRXd3cfNp+p1X70971usA9JaSKfB6Ipa0Qf7ySLzKsm98klpl W8SUaw+tMFRh5GNA1FcQXng6pEpBiGYbfq/4fFS8YBy2nY7q2nSLTzKeRDjqIwTRAkna SzxBRiPKVn+R41N1fdo9mSf1Y1sxw3z3Lv7c7J5TSeMv0rCKYOecKe4ME1cgagxKEvLm GAPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706061872; x=1706666672; 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=C0L9bVQh9fFF0oKkjktvDrxFcbSAT9OZP7oq4WTSKm8=; b=w/CV54zeyPlfVMnG6uxiOm3/CV+pchs613Rcsh7uMD70wCAK+urokynPH7EqDBBisH 4WATS2YURoy/IOjq6wOTu1F5OaX/Xy4FzdUZ8tH+kfNuFw77GhZHZbrRyTkg3/+vBevf 2AahpRN6WFHJTKzmjZYfx8dwf7fU9Mkg4qU8eoYeEFz7rTW1A4Q46Z+2eZHxivWGGoh+ YmJdhD58bUiIZqQMSazuM7eEztYJPj0qOFmjh6vTtH1Xk/R3tQBTPv1BVFk18LA7LaRL HgJX6tcSBlgiG+bZ3SVWJ+646k5X6O1qiD52CHq8HdnlzOrBeJXzJjnZXLQDmNJpuw20 zzGQ== X-Gm-Message-State: AOJu0YxHa6XBsJQDpgempQ1do4H2WMpdRw5Bn/fMteOBSHjGd97EH6Bm 9oba34enO0GY3mODrj+9H3GyKd983JsJAp9hP56K9GpifXUNoLK5J5Ipu+hzCVIXJImrmDGksku HrSoJICmrmV3zDpGNsuK4OrL0YNjcXS1KSjx+jQ0z X-Received: by 2002:a05:6e02:c74:b0:360:a44d:caf5 with SMTP id f20-20020a056e020c7400b00360a44dcaf5mr689147ilj.58.1706061872105; Tue, 23 Jan 2024 18:04:32 -0800 (PST) Received: from wsx-cc1-001.. (c-76-141-0-17.hsd1.il.comcast.net. [76.141.0.17]) by smtp-relay.gmail.com with ESMTPS id x3-20020a92de03000000b0035d56982785sm1146451ilm.77.2024.01.23.18.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:04:32 -0800 (PST) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Jan 2024 20:03:19 -0600 Message-Id: <20240124020318.802247-1-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/avlanguage: add the 6 deprecated DVD languages 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pccDVN9YlCiU There are 6 deprecated ISO language codes that are still valid for DVDs. This patch allows avlanguage to recognize them correctly. The codes are: (1) "in" - legacy code for Indonesian, mapped to the modern code (2) "iw" - legacy code for Hebrew, mapped to the modern code (3) "ji" - legacy code for Yiddish, mapped to the modern code (4) "jw" - legacy code for Javanese, published and used as a typoed version of "jv" (5) "mo" - legacy code for Moldavian, mapped to the inclusive code (6) "sh" - legacy code for Serbo-Croatian, no modern inclusive code so it is left alone All of this can be verified from several sources including: https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes I split this off from the DVD demuxer patch to simplify it a bit. Sent with git send-email and passes fate, pls let me know if there are issues. Thank you, Signed-off-by: Marth64 --- libavformat/avlanguage.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/avlanguage.c b/libavformat/avlanguage.c index 782a58adb2..202d9aa835 100644 --- a/libavformat/avlanguage.c +++ b/libavformat/avlanguage.c @@ -29,7 +29,7 @@ typedef struct LangEntry { uint16_t next_equivalent; } LangEntry; -static const uint16_t lang_table_counts[] = { 484, 20, 184 }; +static const uint16_t lang_table_counts[] = { 484, 20, 190 }; static const uint16_t lang_table_offsets[] = { 0, 484, 504 }; static const LangEntry lang_table[] = { @@ -539,7 +539,7 @@ static const LangEntry lang_table[] = { /*0501*/ { "slk", 647 }, /*0502*/ { "sqi", 652 }, /*0503*/ { "zho", 686 }, - /*----- AV_LANG_ISO639_1 entries (184) -----*/ + /*----- AV_LANG_ISO639_1 entries (190) -----*/ /*0504*/ { "aa" , 0 }, /*0505*/ { "ab" , 1 }, /*0506*/ { "ae" , 33 }, @@ -724,6 +724,12 @@ static const LangEntry lang_table[] = { /*0685*/ { "za" , 478 }, /*0686*/ { "zh" , 78 }, /*0687*/ { "zu" , 480 }, + /*0688*/ { "in" , 195 }, /* deprecated */ + /*0689*/ { "iw" , 172 }, /* deprecated */ + /*0690*/ { "ji" , 472 }, /* deprecated */ + /*0691*/ { "jw" , 202 }, /* deprecated */ + /*0692*/ { "mo" , 358 }, /* deprecated */ + /*0693*/ { "sh" , 693 }, /* deprecated (no equivalent) */ { "", 0 } };