Index: libmpcodecs/vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.119
diff -u -r1.119 vf.c
--- libmpcodecs/vf.c	18 Nov 2005 14:39:22 -0000	1.119
+++ libmpcodecs/vf.c	5 Dec 2005 20:08:57 -0000
@@ -269,6 +269,16 @@
   if (h == -1) h = vf->h;
 
   w2=(mp_imgflag&MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE)?((w+15)&(~15)):w;
+
+  if(w2 != vf->w || h != vf->h) {
+      // Ensure that the filter can accept strided images
+      int flags=vf->query_format(vf,outfmt); // should not fail
+      if(!(flags&3)) mp_msg(MSGT_DECVIDEO,MSGL_WARN,"??? vf_get_image{vf->query_format(outfmt)} failed!\n");
+      if(!(flags&VFCAP_ACCEPT_STRIDE)){
+          w2 = w = vf->w;
+          h = vf->h;
+      }
+  }
   
   if(vf->put_image==vf_next_put_image){
       // passthru mode, if the plugin uses the fallback/default put_image() code