From 50ebcf1a432c4be5e458111b6915130424e56872 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 1 May 2014 23:15:50 +0200 Subject: video: handle colorspace and aspect overrides separately Now the video filter code handles these explicitly, which should increase robustness (or at least find bugs earlier). --- player/sub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'player/sub.c') diff --git a/player/sub.c b/player/sub.c index 00b2260c67..883ffa0dbf 100644 --- a/player/sub.c +++ b/player/sub.c @@ -34,6 +34,7 @@ #include "demux/demux.h" #include "video/mp_image.h" #include "video/decode/dec_video.h" +#include "video/filter/vf.h" #include "core.h" @@ -92,7 +93,7 @@ static void update_subtitle(struct MPContext *mpctx, int order) int obj = order ? OSDTYPE_SUB2 : OSDTYPE_SUB; if (mpctx->d_video) { - struct mp_image_params params = mpctx->d_video->vf_input; + struct mp_image_params params = mpctx->d_video->vfilter->override_params; if (params.imgfmt) sub_control(dec_sub, SD_CTRL_SET_VIDEO_PARAMS, ¶ms); } -- cgit v1.2.3