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 */