diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-09-22 09:56:33 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-10-01 22:24:17 +0200 |
| commit | 81bbce9cf304c93f325b0672b51d65a282c6581f (patch) | |
| tree | b02cef181739806e4eeb15e872ad85cc1e3f36e7 /libavcodec/ansi.c | |
| parent | c39916bc2f43eed86f9822b7d6802b8a4f2a86c8 (diff) | |
| download | ffmpeg-81bbce9cf304c93f325b0672b51d65a282c6581f.tar.gz | |
Move xGA font data from lavc to lavu.
This needs to be accessible for libavfilter in the next commit.
Diffstat (limited to 'libavcodec/ansi.c')
| -rw-r--r-- | libavcodec/ansi.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index 35725005e7..d2f7d3be73 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -26,6 +26,7 @@ #include "libavutil/common.h" #include "libavutil/lfg.h" +#include "libavutil/xga_font_data.h" #include "avcodec.h" #include "cga_data.h" @@ -78,7 +79,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = PIX_FMT_PAL8; /* defaults */ - s->font = ff_vga16_font; + s->font = avpriv_vga16_font; s->font_height = 16; s->fg = DEFAULT_FG_COLOR; s->bg = DEFAULT_BG_COLOR; @@ -203,19 +204,19 @@ static int execute_code(AVCodecContext * avctx, int c) height = avctx->height; switch(s->args[0]) { case 0: case 1: case 4: case 5: case 13: case 19: //320x200 (25 rows) - s->font = ff_cga_font; + s->font = avpriv_cga_font; s->font_height = 8; width = 40<<3; height = 25<<3; break; case 2: case 3: //640x400 (25 rows) - s->font = ff_vga16_font; + s->font = avpriv_vga16_font; s->font_height = 16; width = 80<<3; height = 25<<4; break; case 6: case 14: //640x200 (25 rows) - s->font = ff_cga_font; + s->font = avpriv_cga_font; s->font_height = 8; width = 80<<3; height = 25<<3; @@ -223,13 +224,13 @@ static int execute_code(AVCodecContext * avctx, int c) case 7: //set line wrapping break; case 15: case 16: //640x350 (43 rows) - s->font = ff_cga_font; + s->font = avpriv_cga_font; s->font_height = 8; width = 80<<3; height = 43<<3; break; case 17: case 18: //640x480 (60 rows) - s->font = ff_cga_font; + s->font = avpriv_cga_font; s->font_height = 8; width = 80<<3; height = 60<<4; |