diff options
| author | wm4 <wm4@nowhere> | 2014-05-01 23:15:50 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-05-02 01:09:55 +0200 |
| commit | 50ebcf1a432c4be5e458111b6915130424e56872 (patch) | |
| tree | c43867cb9d450b6f6a86090bad4efb305c882c90 /player/sub.c | |
| parent | f4eaceee0fe24a59828ce37f61173b1dd2afd8d4 (diff) | |
| download | mpv-50ebcf1a432c4be5e458111b6915130424e56872.tar.bz2 mpv-50ebcf1a432c4be5e458111b6915130424e56872.tar.xz | |
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).
Diffstat (limited to 'player/sub.c')
| -rw-r--r-- | player/sub.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |