vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jan 30 12:33:42 2019 +0100| [f770c4bc48d2065ec9b56f2981fdc0ef39ce4d37] | committer: Steve Lhomme
wingdi: remove intermediate Control callback It does the same as CommonControl(). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f770c4bc48d2065ec9b56f2981fdc0ef39ce4d37 --- modules/video_output/win32/wingdi.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c index 2bead115fd..84af9e5105 100644 --- a/modules/video_output/win32/wingdi.c +++ b/modules/video_output/win32/wingdi.c @@ -79,7 +79,6 @@ struct vout_display_sys_t static picture_pool_t *Pool (vout_display_t *, unsigned); static void Display(vout_display_t *, picture_t *); -static int Control(vout_display_t *, int, va_list); static int Init(vout_display_t *, video_format_t *); static void Clean(vout_display_t *); @@ -110,7 +109,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, vd->pool = Pool; vd->prepare = NULL; vd->display = Display; - vd->control = Control; + vd->control = CommonControl; return VLC_SUCCESS; error: @@ -178,18 +177,6 @@ static void Display(vout_display_t *vd, picture_t *picture) CommonManage(vd); } -static int Control(vout_display_t *vd, int query, va_list args) -{ - switch (query) { - case VOUT_DISPLAY_RESET_PICTURES: - vlc_assert_unreachable(); - return VLC_EGENERIC; - default: - return CommonControl(vd, query, args); - } - -} - static int Init(vout_display_t *vd, video_format_t *fmt) { vout_display_sys_t *sys = vd->sys; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
