[xine-cvs] CVS: xine-lib/src/libffmpeg xine_encoder.c,1.3,1.4

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg
In directory sc8-pr-cvs1:/tmp/cvs-serv25882/src/libffmpeg

Modified Files:
	xine_encoder.c 
Log Message:
update video out api to allow better frame management (explicit locking)
img->displayed is obsolete now, drivers should use img->free.


Index: xine_encoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_encoder.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xine_encoder.c	30 May 2003 14:10:49 -0000	1.3
+++ xine_encoder.c	31 May 2003 18:33:29 -0000	1.4
@@ -262,7 +262,7 @@
   if (frame->vo_frame.bad_frame) return 1;
     /* ignore old frames */
   if ((frame->vo_frame.width != this->context->width) || (frame->oheight != this->context->height)) {
-	frame->vo_frame.displayed(&frame->vo_frame);
+	frame->vo_frame.free(&frame->vo_frame);
     printf("LAVC ignoring frame !!!\n");
     return 1;
   }
@@ -273,7 +273,7 @@
   /* do the encoding */
   size = avcodec_encode_video(this->context, this->ffmpeg_buffer, DEFAULT_BUFFER_SIZE, this->picture);
 
-  frame->vo_frame.displayed(&frame->vo_frame);
+  frame->vo_frame.free(&frame->vo_frame);
 	
   if (drv->fd_video == CLOSED_FOR_ENCODER) {
       snprintf (tmpstr, sizeof(tmpstr), "%s_mv%s", drv->class->devname, drv->class->devnum);