Move xGA font data from lavc to lavu.

This needs to be accessible for libavfilter in the next commit.
This commit is contained in:
Clément Bœsch
2012-09-22 09:56:33 +02:00
parent c39916bc2f
commit 81bbce9cf3
9 changed files with 467 additions and 402 deletions

View File

@@ -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;
}
}