summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-08 16:08:33 +0000
committerrik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-11-08 16:08:33 +0000
commit04fe2646f0a4a14c014579942ce44776d00e6d91 (patch)
tree2765af29cbd2583f4cfffa0765af36b05bea5fce /libvo
parentbff15a485201a1604544669be0e91a83ed761752 (diff)
downloadmpv-04fe2646f0a4a14c014579942ce44776d00e6d91.tar.bz2
mpv-04fe2646f0a4a14c014579942ce44776d00e6d91.tar.xz
specification of video norm should not be mandatory
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11418 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_zr2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c
index e81575bc71..49d2510eef 100644
--- a/libvo/vo_zr2.c
+++ b/libvo/vo_zr2.c
@@ -241,8 +241,9 @@ static uint32_t preinit(const char *arg) {
normstring(p->zp.norm));
/* changing the norm in the zoran_params and MJPIOC_S_PARAMS
- * does noting, so bail out if the norm is not correct */
- if (p->zp.norm != norm) {
+ * does nothing the last time I tried, so bail out if the norm
+ * is not correct */
+ if (norm != VIDEO_MODE_AUTO && p->zp.norm != norm) {
ERROR("mplayer currently can't change the video norm, "
"change it with (eg.) XawTV and retry.\n");
uninit();