diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 23e6afc7ce..e60041a352 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -166,6 +166,7 @@ csp_again:
 	mp_msg(MSGT_CPLAYER,MSGL_DBG2,"vo_debug: query(%s) returned 0x%X (i=%d) \n",vo_format_name(out_fmt),flags,i);
 	if((flags&2) || (flags && j<0)){
 	    // check (query) if codec really support this outfmt...
+	    sh->outfmtidx=j; // pass index to the control() function this way
 	    if(mpvdec->control(sh,VDCTRL_QUERY_FORMAT,&out_fmt)==CONTROL_FALSE)
 		continue;
 	    j=i; vo_flags=flags; if(flags&2) break;