From 4c2fb8f3a2dbe4d9411007f169326d646943d216 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 23 Nov 2013 21:39:07 +0100 Subject: dec_video: make vf_input and hwdec_info statically allocated The only reason why these structs were dynamically allocated was to avoid recursive includes in stheader.h, which is (or was) a very central file included by almost all other files. (If a struct is referenced via a pointer type only, it can be forward referenced, and the definition of the struct is not needed.) Now that they're out of stheader.h, this difference doesn't matter anymore, and the code can be simplified. Also sneak in some sanity checks. --- mpvcore/player/command.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mpvcore/player/command.c') diff --git a/mpvcore/player/command.c b/mpvcore/player/command.c index c09a046cd2..d3d99c4b02 100644 --- a/mpvcore/player/command.c +++ b/mpvcore/player/command.c @@ -1439,7 +1439,7 @@ static int mp_property_width(m_option_t *prop, int action, void *arg, return M_PROPERTY_UNAVAILABLE; struct sh_video *sh = vd->header->video; return m_property_int_ro(prop, action, arg, - vd->vf_input ? vd->vf_input->w : sh->disp_w); + vd->vf_input.w ? vd->vf_input.w : sh->disp_w); } /// Video display height (RO) @@ -1451,7 +1451,7 @@ static int mp_property_height(m_option_t *prop, int action, void *arg, return M_PROPERTY_UNAVAILABLE; struct sh_video *sh = vd->header->video; return m_property_int_ro(prop, action, arg, - vd->vf_input ? vd->vf_input->h : sh->disp_h); + vd->vf_input.h ? vd->vf_input.h : sh->disp_h); } static int property_vo_wh(m_option_t *prop, int action, void *arg, @@ -1554,7 +1554,7 @@ static int mp_property_aspect(m_option_t *prop, int action, void *arg, } case M_PROPERTY_GET: { float aspect = -1; - struct mp_image_params *params = d_video->vf_input; + struct mp_image_params *params = &d_video->vf_input; if (params && params->d_w && params->d_h) { aspect = (float)params->d_w / params->d_h; } else if (sh_video->disp_w && sh_video->disp_h) { -- cgit v1.2.3