From 8adc51f2ad03b7732f6078a09a53357e81d3af86 Mon Sep 17 00:00:00 2001 From: Benjamin Larsson Date: Sun, 21 Jan 2007 21:24:05 +0000 Subject: [PATCH] Add flashsv encoder to changelog and fix the encoder so it actually works. Originally committed as revision 7620 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Changelog | 1 + libavcodec/flashsvenc.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index c4943222a4..0b3c318f25 100644 --- a/Changelog +++ b/Changelog @@ -67,6 +67,7 @@ version - GIF picture decoder - Intel Music decoder - Musepack decoder +- Flash Screen Video encoder version 0.4.9-pre1: diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index 0abd2f4dde..8152f3e657 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -211,11 +211,12 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf //av_log(avctx, AV_LOG_INFO, "compressed blocks: %d\n", size); */ bytestream_put_be16(&ptr,(unsigned int)zsize); - buf_pos += zsize; + buf_pos += zsize+2; //av_log(avctx, AV_LOG_ERROR, "buf_pos = %d\n", buf_pos); } else { pred_blocks++; bytestream_put_be16(&ptr,0); + buf_pos += 2; } } } @@ -293,7 +294,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, uint8_t *buf, int buf_siz res = encode_bitstream(s, p, buf, buf_size, opt_w*16, opt_h*16, s->previous_frame, &I_frame); #endif - + av_log(avctx, AV_LOG_ERROR, "res %d\n", res); //save the current frame memcpy(s->previous_frame, p->data[0], s->image_height*p->linesize[0]*3);