summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-03 22:28:31 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-03 22:28:31 +0000
commitfc0239c85b3312c5a575d71e1da99dc022dd5c93 (patch)
treeaf6d18ce48961e0f92771851a8aeef2a7863e7f6 /libmpcodecs
parenta9cce3d878c001b5413d62858c60eb7396a1d8ad (diff)
downloadmpv-fc0239c85b3312c5a575d71e1da99dc022dd5c93.tar.bz2
mpv-fc0239c85b3312c5a575d71e1da99dc022dd5c93.tar.xz
enabled csp-query support, but only for formats with 'query' flag set
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7263 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vd_vfw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c
index a689b7ba5c..e1c843c315 100644
--- a/libmpcodecs/vd_vfw.c
+++ b/libmpcodecs/vd_vfw.c
@@ -115,11 +115,13 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
case VDCTRL_SET_PP_LEVEL:
vfw_set_postproc(sh,10*(*((int*)arg)));
return CONTROL_OK;
-#if 0
+#if 1
// FIXME: make this optional...
case VDCTRL_QUERY_FORMAT:
{
HRESULT ret;
+ if(!(sh->codec->outflags[sh->outfmtidx]&CODECS_FLAG_QUERY))
+ return CONTROL_UNKNOWN; // do not query!
set_csp(priv->o_bih,*((int*)arg));
#ifdef BUILD_VFWEX
ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih);