This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit fff992a5bc91ef521b04e15b83651ec22610110b Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 07:18:07 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:57 2026 +0200 avutil/xga_font_data: Stop exporting font data directly Commit c6c80631868dbe96d9fe0b2a61181d970381191a added getters for them. Also remove av_export_avutil and the BUILDING_foo macro. Signed-off-by: Andreas Rheinhardt <[email protected]> --- ffbuild/library.mak | 2 -- libavutil/internal.h | 6 ------ libavutil/xga_font_data.c | 14 ++++---------- libavutil/xga_font_data.h | 7 ------- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 91daa9c25f..5ab7eb4615 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -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) diff --git a/libavutil/internal.h b/libavutil/internal.h index 2a85170795..2040937bfb 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -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)) diff --git a/libavutil/xga_font_data.c b/libavutil/xga_font_data.c index e4b21760f8..dbd1bbb48a 100644 --- a/libavutil/xga_font_data.c +++ b/libavutil/xga_font_data.c @@ -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; } diff --git a/libavutil/xga_font_data.h b/libavutil/xga_font_data.h index 90d3cec4ce..0ca4d8616d 100644 --- a/libavutil/xga_font_data.h +++ b/libavutil/xga_font_data.h @@ -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); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
