[vlc-commits] v4l2: fix cut and paste error

Rémi Denis-Courmont git at videolan.org
Tue Jul 31 09:17:12 CEST 2012


vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 30 21:20:52 2012 +0300| [0f664fbe510fe63b6395275c05d10aa2c345b821] | committer: Rémi Denis-Courmont

v4l2: fix cut and paste error

(cherry picked from commit f8ac92544e8668a436f6c997275b989b0c5d7299)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=0f664fbe510fe63b6395275c05d10aa2c345b821
---

 modules/access/v4l2/controls.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/v4l2/controls.c b/modules/access/v4l2/controls.c
index 2bfbabb..1f27c7a 100644
--- a/modules/access/v4l2/controls.c
+++ b/modules/access/v4l2/controls.c
@@ -459,12 +459,12 @@ static vlc_v4l2_ctrl_t *ControlAddMenu (vlc_object_t *obj, int fd,
         val.i_int = ctrl.value;
         var_Change (obj, c->name, VLC_VAR_SETVALUE, &val, NULL);
     }
-    val.b_bool = query->default_value;
-    var_Change (obj, c->name, VLC_VAR_SETDEFAULT, &val, NULL);
     val.i_int = query->minimum;
     var_Change (obj, c->name, VLC_VAR_SETMIN, &val, NULL);
     val.i_int = query->maximum;
     var_Change (obj, c->name, VLC_VAR_SETMAX, &val, NULL);
+    val.i_int = query->default_value;
+    var_Change (obj, c->name, VLC_VAR_SETDEFAULT, &val, NULL);
 
     /* Import menu choices */
     for (uint_fast32_t idx = query->minimum;



More information about the vlc-commits mailing list