diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-24 02:03:19 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-24 02:03:19 +0300 |
commit | dd8938650041e22f77e6526281d0dae4727c4160 (patch) | |
tree | 87267baa551ee700c610e87d60938606f4a3e95b /mplayer.c | |
parent | a232f564d3f271277135276281c03cca7807ef16 (diff) | |
download | mpv-dd8938650041e22f77e6526281d0dae4727c4160.tar.bz2 mpv-dd8938650041e22f77e6526281d0dae4727c4160.tar.xz |
Remove unnecessary casts of sh_video->vfilter
The casts were left from the time when the type of sh_video->vfilter
was (unnecessarily) void *. Now that the field has the correct type
the casts are pointless.
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -2154,7 +2154,7 @@ int reinit_video_chain(struct MPContext *mpctx) current_module="init_video_filters"; { char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL }; - sh_video->vfilter=(void*)vf_open_filter(opts, NULL,"vo",vf_arg); + sh_video->vfilter = vf_open_filter(opts, NULL,"vo",vf_arg); } #ifdef HAVE_MENU if(use_menu) { @@ -2166,7 +2166,7 @@ int reinit_video_chain(struct MPContext *mpctx) } } if(vf_menu) - sh_video->vfilter=(void*)vf_menu; + sh_video->vfilter = vf_menu; #endif #ifdef USE_ASS @@ -2185,18 +2185,18 @@ int reinit_video_chain(struct MPContext *mpctx) char* vf_arg[] = {"auto", "1", NULL}; vf_instance_t* vf_ass = vf_open_plugin(opts, libass_vfs,sh_video->vfilter,"ass",vf_arg); if (vf_ass) - sh_video->vfilter=(void*)vf_ass; + sh_video->vfilter = vf_ass; else mp_msg(MSGT_CPLAYER,MSGL_ERR, "ASS: cannot add video filter\n"); } } #endif - sh_video->vfilter=(void*)append_filters(sh_video->vfilter, opts->vf_settings); + sh_video->vfilter = append_filters(sh_video->vfilter, opts->vf_settings); #ifdef USE_ASS if (ass_enabled) - ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_INIT_EOSD, ass_library); + sh_video->vfilter->control(sh_video->vfilter, VFCTRL_INIT_EOSD, ass_library); #endif current_module="init_video_codec"; @@ -2301,8 +2301,8 @@ static double update_video(struct MPContext *mpctx, int *blit_frame) int res = generate_video_frame(mpctx); if (!res) return -1; - ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, - VFCTRL_GET_PTS, &sh_video->pts); + sh_video->vfilter->control(sh_video->vfilter, VFCTRL_GET_PTS, + &sh_video->pts); if (sh_video->pts == MP_NOPTS_VALUE) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts after filters MISSING\n"); sh_video->pts = sh_video->last_pts; |