You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-04 22:03:09 +02:00
avutil/xga_font_data: add getters to access the shared arrays
And stop exposing the arrays on the next major bump. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@ -26,6 +26,9 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "xga_font_data.h"
|
#include "xga_font_data.h"
|
||||||
|
|
||||||
|
#if LIBAVUTIL_VERSION_MAJOR > 60
|
||||||
|
static
|
||||||
|
#endif
|
||||||
const uint8_t avpriv_cga_font[2048] = {
|
const uint8_t avpriv_cga_font[2048] = {
|
||||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e,
|
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,
|
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,
|
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] = {
|
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, 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, 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, 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
|
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;
|
||||||
|
}
|
||||||
|
@ -28,8 +28,14 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "internal.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_cga_font[2048];
|
||||||
extern av_export_avutil const uint8_t avpriv_vga16_font[4096];
|
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 */
|
#endif /* AVUTIL_XGA_FONT_DATA_H */
|
||||||
|
Reference in New Issue
Block a user