summaryrefslogtreecommitdiffstats
path: root/video/decode/dec_video.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-20 15:38:19 +0200
committerwm4 <wm4@nowhere>2016-09-20 15:44:23 +0200
commit23639e5b0ea5d4af50a2d5aedef11cd240e2390c (patch)
tree994ec33c1c686c08160be493f97b98ebee3f3fa0 /video/decode/dec_video.c
parente13eb3fede680fdadb76efce957806654cda0f23 (diff)
downloadmpv-23639e5b0ea5d4af50a2d5aedef11cd240e2390c.tar.bz2
mpv-23639e5b0ea5d4af50a2d5aedef11cd240e2390c.tar.xz
video: handle override video parameters in a better place
This really shouldn't be in vd_lavc.c - move it to dec_video.c, where it also applies aspect overrides. This makes all overrides in one place. The previous commit contains some required changes for resetting the image parameters change detection (i.e. it's not done only on video aspect override changes).
Diffstat (limited to 'video/decode/dec_video.c')
-rw-r--r--video/decode/dec_video.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 51f959ff6d..02fa334e2b 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -236,6 +236,13 @@ static void fix_image_params(struct dec_video *d_video,
if (p.p_w <= 0 || p.p_h <= 0)
p.p_w = p.p_h = 1;
+ if (opts->video_rotate < 0) {
+ p.rotate = 0;
+ } else {
+ p.rotate = (p.rotate + opts->video_rotate) % 360;
+ }
+ p.stereo_out = opts->video_stereo_mode;
+
// Detect colorspace from resolution.
mp_image_params_guess_csp(&p);