diff options
Diffstat (limited to 'libavcodec/tmv.c')
| -rw-r--r-- | libavcodec/tmv.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index c56635e722..63ec830f6d 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -2,20 +2,20 @@ * 8088flex TMV video decoder * Copyright (c) 2009 Daniel Verkamp <daniel at drv.nu> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -31,6 +31,7 @@ #include "avcodec.h" #include "internal.h" #include "libavutil/internal.h" +#include "libavutil/xga_font_data.h" #include "cga_data.h" @@ -76,7 +77,7 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, bg = *src >> 4; fg = *src++ & 0xF; ff_draw_pc_font(dst + x * 8, tmv->pic.linesize[0], - ff_cga_font, 8, c, fg, bg); + avpriv_cga_font, 8, c, fg, bg); } dst += tmv->pic.linesize[0] * 8; } @@ -88,7 +89,9 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, static av_cold int tmv_decode_init(AVCodecContext *avctx) { + TMVContext *tmv = avctx->priv_data; avctx->pix_fmt = AV_PIX_FMT_PAL8; + avcodec_get_frame_defaults(&tmv->pic); return 0; } |