diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-30 20:47:18 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-08-30 20:47:18 +0000 |
commit | 21c2e043717e1deec8b3c68149151b62cf5759e0 (patch) | |
tree | e15b9bd3f4f2aaceb48e80d829f2d291a96cb563 /libmpcodecs/vd_vfw.c | |
parent | 26c9b4ee5edfb50dd4684a19aa97ad7651c42a7c (diff) | |
download | mpv-21c2e043717e1deec8b3c68149151b62cf5759e0.tar.bz2 mpv-21c2e043717e1deec8b3c68149151b62cf5759e0.tar.xz |
vfwex separated from vfw, to work with new vfm system and dlopen
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7176 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_vfw.c')
-rw-r--r-- | libmpcodecs/vd_vfw.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index ed5e1fc17f..b6a10a6ceb 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -20,22 +20,7 @@ static vd_info_t info_vfw = { "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 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // 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 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ 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; } |