From d09c0a1666fa3509dc39b027df8497c8518e5338 Mon Sep 17 00:00:00 2001 From: Tobias Bindhammer Date: Wed, 25 Aug 2010 11:47:50 +0000 Subject: [PATCH] cleanup a bit in a64multi_encode_frame() Originally committed as revision 24914 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/a64multienc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c index 1b281ec5f2..5a91a149b2 100644 --- a/libavcodec/a64multienc.c +++ b/libavcodec/a64multienc.c @@ -271,6 +271,7 @@ static int a64multi_encode_frame(AVCodecContext *avctx, unsigned char *buf, /* lifetime reached so now convert X frames at once */ if (c->mc_frame_counter == c->mc_lifetime) { + req_size = 0; /* any frames to encode? */ if(c->mc_lifetime) { /* calc optimal new charset + charmaps */ @@ -279,15 +280,8 @@ static int a64multi_encode_frame(AVCodecContext *avctx, unsigned char *buf, /* create colorram map and a c64 readable charset */ render_charset(avctx, charset, colram); - } - - req_size = 0; /* copy charset to buf */ - //XXX this all should maybe move to the muxer? as well as teh chunked/not chunked thing? - /* either write charset as a whole (more comfy when playing from mem) */ - /* copy charset chunk if exists */ - if(c->mc_lifetime) { memcpy(buf,charset,0x800*(INTERLACED+1)); /* advance pointers */