diff options
author | Peter Ross <pross@xvid.org> | 2010-07-18 07:46:29 +0000 |
---|---|---|
committer | Peter Ross <pross@xvid.org> | 2010-07-18 07:46:29 +0000 |
commit | 3625999e15bb4105752bd2ef89beeb558f450e4d (patch) | |
tree | 4539cc5250643a1f16f29e7e3a57552341fe484d /libavcodec | |
parent | 9e5f3dfe25496543dc73945e4b5b32477261c899 (diff) | |
download | ffmpeg-streaming-3625999e15bb4105752bd2ef89beeb558f450e4d.zip ffmpeg-streaming-3625999e15bb4105752bd2ef89beeb558f450e4d.tar.gz |
8088flex TMV video decoder now uses ff_draw_pc_font()
Originally committed as revision 24297 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/tmv.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c index 5117cd0..7e0f9a1 100644 --- a/libavcodec/tmv.c +++ b/libavcodec/tmv.c @@ -39,10 +39,10 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, { TMVContext *tmv = avctx->priv_data; const uint8_t *src = avpkt->data; - uint8_t *dst, *dst_char; + uint8_t *dst; unsigned char_cols = avctx->width >> 3; unsigned char_rows = avctx->height >> 3; - unsigned x, y, mask, char_y, fg, bg, c; + unsigned x, y, fg, bg, c; if (tmv->pic.data[0]) avctx->release_buffer(avctx, &tmv->pic); @@ -68,17 +68,11 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, for (y = 0; y < char_rows; y++) { for (x = 0; x < char_cols; x++) { - c = *src++ * 8; + c = *src++; bg = *src >> 4; fg = *src++ & 0xF; - - dst_char = dst + x * 8; - for (char_y = 0; char_y < 8; char_y++) { - for (mask = 0x80; mask; mask >>= 1) { - *dst_char++ = ff_cga_font[c + char_y] & mask ? fg : bg; - } - dst_char += tmv->pic.linesize[0] - 8; - } + ff_draw_pc_font(dst + x * 8, tmv->pic.linesize[0], + ff_cga_font, 8, c, fg, bg); } dst += tmv->pic.linesize[0] * 8; } |