[SCM] libav/experimental: cleanup a bit in a64multi_encode_frame()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d09c0a1666fa3509dc39b027df8497c8518e5338
Author: Tobias Bindhammer <tobias.bindhammer at uni-ulm.de>
Date:   Wed Aug 25 11:47:50 2010 +0000

    cleanup a bit in a64multi_encode_frame()
    
    Originally committed as revision 24914 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c
index 1b281ec..5a91a14 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 */

-- 
Libav/FFmpeg packaging