dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-24 08:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

avutil/xga_font_data: Stop exporting font data directly

Browse Source 
Commit c6c8063186 added getters for them.
Also remove av_export_avutil and the BUILDING_foo macro.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2026-03-09 07:18:07 +01:00
parent da0ea43984
commit fff992a5bc
4 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ffbuild/library.mak
View File

@@ -53,8 +53,6 @@ define RULES
$(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
$(LIBOBJS): CPPFLAGS += -DBUILDING_$(NAME)
$(NAME)LINK_EXE_ARGS = $(LDFLAGS) $(LDEXEFLAGS)
$(NAME)LINK_SO_ARGS = $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS)
$(NAME)LINK_EXTRA = $(FFEXTRALIBS)

6
libavutil/internal.h
View File

@@ -51,12 +51,6 @@
#endif
#endif
#if defined(_WIN32) && CONFIG_SHARED && !defined(BUILDING_avutil)
# define av_export_avutil __declspec(dllimport)
#else
# define av_export_avutil
#endif
#if HAVE_PRAGMA_DEPRECATED
# if defined(__ICL) || defined (__INTEL_COMPILER)
# define FF_DISABLE_DEPRECATION_WARNINGS __pragma(warning(push)) __pragma(warning(disable:1478))

14
libavutil/xga_font_data.c
View File

@@ -26,10 +26,7 @@
#include <stdint.h>
#include "xga_font_data.h"
#if LIBAVUTIL_VERSION_MAJOR > 60
static
#endif
const uint8_t avpriv_cga_font[2048] = {
static const uint8_t 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,
0x10, 0x38, 0x7c, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x38, 0x7c, 0x38, 0xfe, 0xfe, 0x7c, 0x38, 0x7c,
@@ -162,13 +159,10 @@ const uint8_t avpriv_cga_font[2048] = {
const uint8_t *avpriv_cga_font_get(void)
{
return avpriv_cga_font;
return cga_font;
}
#if LIBAVUTIL_VERSION_MAJOR > 60
static
#endif
const uint8_t avpriv_vga16_font[4096] = {
static const uint8_t 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,
0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xc3, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
@@ -429,5 +423,5 @@ const uint8_t avpriv_vga16_font[4096] = {
const uint8_t *avpriv_vga16_font_get(void)
{
return avpriv_vga16_font;
return vga16_font;
}

7
libavutil/xga_font_data.h
View File

@@ -27,13 +27,6 @@
#define AVUTIL_XGA_FONT_DATA_H
#include <stdint.h>
#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);