Mercurial > mplayer.hg
diff libmpcodecs/vd_vfw.c @ 7175:f8b147aab1a5
vfwex separated from vfw, to work with new vfm system and dlopen
author | arpi |
---|---|
date | Fri, 30 Aug 2002 20:47:18 +0000 |
parents | e69615f1c309 |
children | 42222161de9b |
line wrap: on
line diff
--- a/libmpcodecs/vd_vfw.c Fri Aug 30 20:06:22 2002 +0000 +++ b/libmpcodecs/vd_vfw.c Fri Aug 30 20:47:18 2002 +0000 @@ -20,22 +20,7 @@ "win32 codecs" }; -static vd_info_t info_vfwex = { - "Win32/VfWex video codecs", - "vfwex", - VFM_VFWEX, - "A'rpi", - "based on http://avifile.sf.net", - "win32 codecs" -}; - -#define info info_vfw LIBVD_EXTERN(vfw) -#undef info - -#define info info_vfwex -LIBVD_EXTERN(vfwex) -#undef info // to set/get/query special features/parameters static int control(sh_video_t *sh,int cmd,void* arg,...){ @@ -52,18 +37,16 @@ // init driver static int init(sh_video_t *sh){ if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0; - if(!init_vfw_video_codec(sh,(sh->codec->driver==VFM_VFWEX))) return 0; + if(!init_vfw_video_codec(sh,0)) return 0; mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32 video codec init OK!\n"); return 1; } // uninit driver static void uninit(sh_video_t *sh){ - vfw_close_video_codec(sh, (sh->codec->driver==VFM_VFWEX)); + vfw_close_video_codec(sh, 0); } -//mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h); - // decode a frame static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ mp_image_t* mpi; @@ -86,7 +69,7 @@ sh->bih->biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8); sh->o_bih.biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8); - if((ret=vfw_decode_video(sh,data,len,flags&3,(sh->codec->driver==VFM_VFWEX) ))){ + if((ret=vfw_decode_video(sh,data,len,flags&3,0))){ mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error decompressing frame, err=%d\n",ret); return NULL; }