[Ffmpeg-cvslog] r8309 - trunk/libavcodec/flashsvenc.c

banan subversion
Sat Mar 10 10:20:07 CET 2007


Author: banan
Date: Sat Mar 10 10:20:07 2007
New Revision: 8309

Modified:
   trunk/libavcodec/flashsvenc.c

Log:
Simplify, use avctx->frame_number.


Modified: trunk/libavcodec/flashsvenc.c
==============================================================================
--- trunk/libavcodec/flashsvenc.c	(original)
+++ trunk/libavcodec/flashsvenc.c	Sat Mar 10 10:20:07 2007
@@ -68,7 +68,6 @@ typedef struct FlashSVContext {
     AVCodecContext *avctx;
     uint8_t *previous_frame;
     AVFrame frame;
-    int first_frame;
     int image_width, image_height;
     int block_width, block_height;
     uint8_t* tmpblock;
@@ -113,8 +112,6 @@ static int flashsv_encode_init(AVCodecCo
         return -1;
     }
 
-    s->first_frame = 1;
-
     // Needed if zlib unused or init aborted before deflateInit
     memset(&(s->zstream), 0, sizeof(z_stream));
 /*
@@ -241,14 +238,13 @@ static int flashsv_encode_frame(AVCodecC
 
     *p = *pict;
 
-    if (s->first_frame) {
+    if (avctx->frame_number == 0) {
         s->previous_frame = av_mallocz(p->linesize[0]*s->image_height);
         if (!s->previous_frame) {
             av_log(avctx, AV_LOG_ERROR, "Memory allocation failed.\n");
             return -1;
         }
         I_frame = 1;
-        s->first_frame = 0;
     }
 
 #if 0




More information about the ffmpeg-cvslog mailing list