Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'

[ffmpeg] / libavcodec / bintext.c

diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c
index 06742c1d9f46bcc57b5bebf91e0f2e5410f1d5d4..9c36b6ba01bb9c0d170ea620fd148132a3b867aa 100644 (file)
--- 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"
@@ -48,7 +49,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
     uint8_t *p;
     int i;
 
-    avctx->pix_fmt = PIX_FMT_PAL8;
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
     p = avctx->extradata;
     if (p) {
         s->font_height = p[0];
@@ -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;
         }
     }
@@ -94,7 +95,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
 }
 
 #define DEFAULT_BG_COLOR 0
-static void hscroll(AVCodecContext *avctx)
+av_unused static void hscroll(AVCodecContext *avctx)
 {
     XbinContext *s = avctx->priv_data;
     if (s->y < avctx->height - s->font_height) {