[vlc-commits] vout: reset A.R. and zoom to sane defaults if unset (fixes #8184)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 11 17:06:53 2014 +0300| [c5138aedf45a23deb989f3f12652742e4189cce5] | committer: Rémi Denis-Courmont

vout: reset A.R. and zoom to sane defaults if unset (fixes #8184)

(cherry picked from commit fb63f1cc675c5302628ad2fec033ac2472107085)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c5138aedf45a23deb989f3f12652742e4189cce5
---

 src/video_output/video_output.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 2dd43f4..1b01ee0 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1452,8 +1452,17 @@ static int ThreadReinit(vout_thread_t *vout,
     }
     state.sar.num = 0;
     state.sar.den = 0;
+
     /* FIXME current vout "variables" are not in sync here anymore
      * and I am not sure what to do */
+    if (state.cfg.display.sar.num <= 0 || state.cfg.display.sar.den <= 0) {
+        state.cfg.display.sar.num = 1;
+        state.cfg.display.sar.den = 1;
+    }
+    if (state.cfg.zoom.num <= 0 || state.cfg.zoom.den <= 0) {
+        state.cfg.zoom.num = 1;
+        state.cfg.zoom.den = 1;
+    }
 
     vout->p->original = original;
     vout->p->dpb_size = cfg->dpb_size;