[vlc-commits] Drop v4l2 access priority to zero to avoid redumdant load/probe

Rémi Denis-Courmont git at videolan.org
Thu Sep 1 20:17:46 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Sep  1 19:34:13 2011 +0300| [9a35916bb2c4342ce1019ffe138c982747c49dd6] | committer: Rémi Denis-Courmont

Drop v4l2 access priority to zero to avoid redumdant load/probe

Maybe one day we will support autodetecting V4L2 device nodes
(as file://) but until then...

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

 modules/access/v4l2.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 4a36637..ecda890 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -402,7 +402,7 @@ vlc_module_begin ()
     add_obsolete_integer( CFG_PREFIX "samplerate" )
 
     add_shortcut( "v4l2" )
-    set_capability( "access_demux", 10 )
+    set_capability( "access_demux", 0 )
     set_callbacks( DemuxOpen, DemuxClose )
 
     add_submodule ()
@@ -641,10 +641,6 @@ static int DemuxOpen( vlc_object_t *p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
 
-    /* Only when selected */
-    if( strcmp( p_demux->psz_access, "v4l2" ) )
-        return VLC_EGENERIC;
-
     /* Set up p_demux */
     p_demux->pf_control = DemuxControl;
     p_demux->pf_demux = Demux;



More information about the vlc-commits mailing list