[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec ffv1.c,1.37,1.38

Loren Merritt CVS lorenm
Sat Apr 29 01:16:45 CEST 2006


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv14514

Modified Files:
	ffv1.c 
Log Message:
memory leak.



Index: ffv1.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ffv1.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ffv1.c	14 Apr 2006 10:37:40 -0000	1.37
+++ ffv1.c	28 Apr 2006 23:16:42 -0000	1.38
@@ -688,7 +688,8 @@
     }
 }
 
-static void common_end(FFV1Context *s){
+static int common_end(AVCodecContext *avctx){
+    FFV1Context *s = avctx->priv_data;
     int i;
 
     for(i=0; i<s->plane_count; i++){
@@ -696,13 +697,6 @@
 
         av_freep(&p->state);
     }
-}
-
-static int encode_end(AVCodecContext *avctx)
-{
-    FFV1Context *s = avctx->priv_data;
-
-    common_end(s);
 
     return 0;
 }
@@ -1018,7 +1012,7 @@
     sizeof(FFV1Context),
     decode_init,
     NULL,
-    NULL,
+    common_end,
     decode_frame,
     CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
     NULL
@@ -1032,6 +1026,6 @@
     sizeof(FFV1Context),
     encode_init,
     encode_frame,
-    encode_end,
+    common_end,
 };
 #endif





More information about the ffmpeg-cvslog mailing list