From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 4536744AF8 for ; Tue, 22 Jul 2025 00:47:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1735268CC5A; Tue, 22 Jul 2025 03:47:10 +0300 (EEST) Received: from mail-vk1-f172.google.com (mail-vk1-f172.google.com [209.85.221.172]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 70F26680459 for ; Tue, 22 Jul 2025 03:47:03 +0300 (EEST) Received: by mail-vk1-f172.google.com with SMTP id 71dfb90a1353d-5346b75d719so2219752e0c.1 for ; Mon, 21 Jul 2025 17:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1753145221; x=1753750021; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3jPnDYefPfx3I3GyViXIHk+HIUTVDQHYBbTl5vlp3a4=; b=It4I2LqXVboBYWfvFPE/Mpe3AJuW6oNAT8hM0ufMiUEnqgzO2FACiHgzgH4Bqo4GWR IC/fcV65p5RYH1KN0lasKPEQc7cYkAiAht/WICySkEkAwBJHax+dSFuV7irhtisofIv4 IMAvLQW1nvbU5ayp/KW0BknfQPNLtc0elFhwnY3kzb2NsUpj3pdoaw8UhblsVdIssmpB tdSC9QCMHsSV13OLlG394V30HPIIV3fjmEMnpOZ/MtY/Bd9m7BLxL8JUOM3Rzeutoq2O ZNCLfWqAryVCt2760lSWWshaY6RlcuAy8wbrJ3cvC+CeqROdmmdNuciBNzoQLaGxtTkq HmTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753145221; x=1753750021; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3jPnDYefPfx3I3GyViXIHk+HIUTVDQHYBbTl5vlp3a4=; b=PlEOFg2Xpodqcjwe5lekm4tL464S/3u9e+H95X28w6Hbv08S1XXWCv0+Kc49bNUrdO zXxw7UOsVBL+xsLA32DJ2f5A+k1bHS9Al8S54Ei2vvaCeRPNZFIjOER6/sK7zqkRAVSK VtZfspXOq9DOrRmD2J9h1l90//LCCE2EIzSl5VZQe4EzuOnkXId70o1aHBOhg2Blc5aO +MJUFMHP58rl0ThTo12cOut+VsiEA3rrrNA63HIfslJK97dI4l2GALo1zz3pPLju+vEK JNZPrTV4R6488NfI6lYGLqW63VaIQxKWHbAZi1HCxFfQI64edVFQsenYWp1V04CJMt+T ZIbQ== X-Gm-Message-State: AOJu0YyddlCDZOTL4fnqjyjH2hzVGp5b+Cv9gLusVob4d3NDCHL2axqb 2SmfH4s5XZxw6LDKLNn9F3tRu8bKn1rGYdSrR2zd89KPBgQ9Hdj0ReOgV/fvXQ== X-Gm-Gg: ASbGncswJ3pCcyyz/P6Nv48Vk1EAxZgjSIsIbdNTr/BThn3Gfzx9bph9MuYLFrDDxL9 lx4nxS8yr1eM7p+sC2iAK+6iv6qqNuetRJhXU2LL6OiVQHCFanlHP2J1rEa5r3O7wDQFGza+42/ /CmF6qz7/tizc12DkriX/6jO8UhbfV+Ly73uVyFCCCuOI7M6gcuHN9OC4QZyrVTDfJ866ul0UNy 0PjJ6n6TJkeMMGk9Whu73dYXvkesAhcBG/8wv6PA7GHqiPjVq2fZk6m9n8DHvkWMjqUQKhIrCP0 Z4+vhuI/Tb0DcOaCeTUH2Ey5h535ozw6Uumzl+jMHKv04T0FNPYClfdPYEMtES/C4ZXWWHahlno UoO9d9LjJJzRarElhuUk= X-Google-Smtp-Source: AGHT+IH3cUWve4bl/jeezmsaM0GOswOprykOWWKpseTUdJiyy+DN4fZYxrUKfbAtZSprVwaVC27koQ== X-Received: by 2002:a05:6122:c9d:b0:530:2c65:5bb9 with SMTP id 71dfb90a1353d-5373e320029mr12645085e0c.8.1753145221277; Mon, 21 Jul 2025 17:47:01 -0700 (PDT) Received: from Gryph ([2800:2121:b000:82e:a1d7:ee24:579c:2fe2]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-53764eed627sm3484929e0c.4.2025.07.21.17.46.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jul 2025 17:46:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Jul 2025 21:46:45 -0300 Message-ID: <20250722004647.15233-1-jamrial@gmail.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avutil/xga_font_data: add getters to access the shared arrays 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 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: And stop exposing the arrays on the next major bump. Signed-off-by: James Almer --- libavutil/xga_font_data.c | 16 ++++++++++++++++ libavutil/xga_font_data.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/libavutil/xga_font_data.c b/libavutil/xga_font_data.c index 3aed3142cf..e4b21760f8 100644 --- a/libavutil/xga_font_data.c +++ b/libavutil/xga_font_data.c @@ -26,6 +26,9 @@ #include #include "xga_font_data.h" +#if LIBAVUTIL_VERSION_MAJOR > 60 +static +#endif const uint8_t avpriv_cga_font[2048] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, 0x7e, 0xff, 0xdb, 0xff, 0xc3, 0xe7, 0xff, 0x7e, 0x6c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10, 0x00, @@ -157,6 +160,14 @@ const uint8_t avpriv_cga_font[2048] = { 0x00, 0x00, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +const uint8_t *avpriv_cga_font_get(void) +{ + return avpriv_cga_font; +} + +#if LIBAVUTIL_VERSION_MAJOR > 60 +static +#endif const uint8_t avpriv_vga16_font[4096] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd, 0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, @@ -415,3 +426,8 @@ const uint8_t avpriv_vga16_font[4096] = { 0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +const uint8_t *avpriv_vga16_font_get(void) +{ + return avpriv_vga16_font; +} diff --git a/libavutil/xga_font_data.h b/libavutil/xga_font_data.h index 69dc337120..90d3cec4ce 100644 --- a/libavutil/xga_font_data.h +++ b/libavutil/xga_font_data.h @@ -28,8 +28,14 @@ #include #include "internal.h" +#include "version.h" +#if LIBAVUTIL_VERSION_MAJOR < 61 extern av_export_avutil const uint8_t avpriv_cga_font[2048]; extern av_export_avutil const uint8_t avpriv_vga16_font[4096]; +#endif + +const uint8_t *avpriv_cga_font_get(void); +const uint8_t *avpriv_vga16_font_get(void); #endif /* AVUTIL_XGA_FONT_DATA_H */ -- 2.50.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".