[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.24,1.25

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv3700/libmpcodecs

Modified Files:
	vd_ffmpeg.c 
Log Message:
Don't call libvo draw slice directly


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vd_ffmpeg.c	9 Jul 2002 18:53:07 -0000	1.24
+++ vd_ffmpeg.c	11 Jul 2002 20:19:00 -0000	1.25
@@ -186,19 +186,17 @@
 	free(ctx);
 }
 
-#include "libvo/video_out.h"	// FIXME!!!
-
 static void draw_slice(struct AVCodecContext *s,
                 	UINT8 **src, int linesize,
                 	int y, int width, int height){
-    vo_functions_t * output = s->opaque;
+    sh_video_t * sh = s->opaque;
     int stride[3];
 
     stride[0]=linesize;
     stride[1]=stride[2]=stride[0]/2;
 
-    output->draw_slice (src, stride, width, height, 0, y);
-    
+    mpcodecs_draw_slice (sh,src, stride, width, height, 0, y);
+
 }
 
 // decode a frame
@@ -220,7 +218,7 @@
 	if(mpi && mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){
 	    // vd core likes slices!
 	    avctx->draw_horiz_band=draw_slice;
-	    avctx->opaque=sh->video_out;
+	    avctx->opaque=sh;
 	}
     }