Commit 65c42d24 authored by banan's avatar banan

Add flashsv encoder to changelog and fix the encoder so it actually works.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7620 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 581ee7a8
...@@ -67,6 +67,7 @@ version <next> ...@@ -67,6 +67,7 @@ version <next>
- GIF picture decoder - GIF picture decoder
- Intel Music decoder - Intel Music decoder
- Musepack decoder - Musepack decoder
- Flash Screen Video encoder
version 0.4.9-pre1: version 0.4.9-pre1:
......
...@@ -211,11 +211,12 @@ static int encode_bitstream(FlashSVContext *s, AVFrame *p, uint8_t *buf, int buf ...@@ -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); //av_log(avctx, AV_LOG_INFO, "compressed blocks: %d\n", size);
*/ */
bytestream_put_be16(&ptr,(unsigned int)zsize); 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); //av_log(avctx, AV_LOG_ERROR, "buf_pos = %d\n", buf_pos);
} else { } else {
pred_blocks++; pred_blocks++;
bytestream_put_be16(&ptr,0); 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 ...@@ -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); res = encode_bitstream(s, p, buf, buf_size, opt_w*16, opt_h*16, s->previous_frame, &I_frame);
#endif #endif
av_log(avctx, AV_LOG_ERROR, "res %d\n", res);
//save the current frame //save the current frame
memcpy(s->previous_frame, p->data[0], s->image_height*p->linesize[0]*3); memcpy(s->previous_frame, p->data[0], s->image_height*p->linesize[0]*3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment