summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-06 19:45:55 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-06 19:45:55 +0000
commit94ea9449cc9d86bb47e82598bebfaa5260b03001 (patch)
tree88345075040c9168db5766c4952dfd323a2f7349 /libmpdemux
parent40e196f4a61b0ced042a8a2c79b300c46145b436 (diff)
downloadmpv-94ea9449cc9d86bb47e82598bebfaa5260b03001.tar.bz2
mpv-94ea9449cc9d86bb47e82598bebfaa5260b03001.tar.xz
take into account that VIDIOC_S_FMT might return updated parameters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16187 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/tvi_v4l2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c
index 1508e14285..335491f6bc 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/libmpdemux/tvi_v4l2.c
@@ -590,6 +590,9 @@ static int control(priv_t *priv, int cmd, void *arg)
info.short_name, strerror(errno));
return TVI_CONTROL_FALSE;
}
+ /* according to the v4l2 specs VIDIOC_S_FMT should not fail, inflexible drivers
+ might even always return the default parameters -> update the format here*/
+ priv->mp_format = fcc_vl2mp(priv->format.fmt.pix.pixelformat);
return TVI_CONTROL_TRUE;
case TVI_CONTROL_VID_GET_WIDTH:
if (getfmt(priv) < 0) return TVI_CONTROL_FALSE;