[Mplayer-cvslog] CVS: main/libmpcodecs vf.c,1.26,1.27

[Arpi of Ize]

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

Modified Files:
	vf.c 
Log Message:
passthru mode for filters which don't alter image just config parameters (query_format/control/config)

Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vf.c	27 Apr 2002 23:35:23 -0000	1.26
+++ vf.c	6 May 2002 22:48:22 -0000	1.27
@@ -25,6 +25,7 @@
 extern vf_info_t vf_info_mirror;
 extern vf_info_t vf_info_palette;
 extern vf_info_t vf_info_lavc;
+extern vf_info_t vf_info_dvbscale;
 
 char** vo_plugin_args=(char**) NULL;
 
@@ -49,6 +50,7 @@
 #ifdef USE_LIBAVCODEC
     &vf_info_lavc,
 #endif
+    &vf_info_dvbscale,
     NULL
 };
 
@@ -95,6 +97,12 @@
 mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h){
   mp_image_t* mpi=NULL;
   int w2=w; //(mp_imgflag&MP_IMGFLAG_ACCEPT_STRIDE)?((w+15)&(~15)):w;
+  
+  if(vf->put_image==vf_next_put_image){
+      // passthru mode, if the plugin uses the fallback/default put_image() code
+      return vf_get_image(vf->next,outfmt,mp_imgtype,mp_imgflag,w,h);
+  }
+  
   // Note: we should call libvo first to check if it supports direct rendering
   // and if not, then fallback to software buffers:
   switch(mp_imgtype){
@@ -288,7 +296,7 @@
 }
 
 void vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi){
-    return vf->next->put_image(vf->next,mpi);
+    vf->next->put_image(vf->next,mpi);
 }
 
 //============================================================================