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/bintext.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/bintext.c')
| -rw-r--r-- | libavcodec/bintext.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index 8c12c590a6..ecc090b625 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -29,6 +29,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavutil/xga_font_data.h" #include "avcodec.h" #include "cga_data.h" #include "bintext.h" @@ -82,10 +83,10 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_WARNING, "font height %i not supported\n", s->font_height); s->font_height = 8; case 8: - s->font = ff_cga_font; + s->font = avpriv_cga_font; break; case 16: - s->font = ff_vga16_font; + s->font = avpriv_vga16_font; break; } } |