summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-01 23:15:50 +0200
committerwm4 <wm4@nowhere>2014-05-02 01:09:55 +0200
commit50ebcf1a432c4be5e458111b6915130424e56872 (patch)
treec43867cb9d450b6f6a86090bad4efb305c882c90 /video/decode
parentf4eaceee0fe24a59828ce37f61173b1dd2afd8d4 (diff)
downloadmpv-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 'video/decode')
-rw-r--r--video/decode/dec_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 7ade93b577..b59ded7ac3 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -431,12 +431,12 @@ int video_reconfig_filters(struct dec_video *d_video,
MP_VERBOSE(d_video, "VO Config (%dx%d->%dx%d,0x%X)\n",
p.w, p.h, p.d_w, p.d_h, p.imgfmt);
- if (vf_reconfig(d_video->vfilter, &p) < 0) {
+ if (vf_reconfig(d_video->vfilter, params, &p) < 0) {
MP_FATAL(d_video, "Cannot initialize video filters.\n");
return -1;
}
- d_video->vf_input = p;
+ d_video->vf_input = *params;
return 0;
}