[vlc-commits] v4l2: add v4l shortcut

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 31 18:48:23 2012 +0300| [5bcf0809eb0f74066555225839d6f58c94cc88e4] | committer: Rémi Denis-Courmont

v4l2: add v4l shortcut

Anyway V4L1 is dead, so there is no ambiguity.
(cherry picked from commit c7d276074d6f83580a4c5e6fb15699bcf92db227)

Conflicts:

	modules/access/v4l2/v4l2.c

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

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

diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 5324512..6337386 100644
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -441,12 +441,12 @@ vlc_module_begin ()
     add_obsolete_bool( CFG_PREFIX "stereo" )
     add_obsolete_integer( CFG_PREFIX "samplerate" )
 
-    add_shortcut( "v4l2" )
+    add_shortcut( "v4l", "v4l2" )
     set_capability( "access_demux", 0 )
     set_callbacks( DemuxOpen, DemuxClose )
 
     add_submodule ()
-    add_shortcut( "v4l2", "v4l2c" )
+    add_shortcut( "v4l", "v4l2", "v4l2c" )
     set_description( N_("Video4Linux2 Compressed A/V") )
     set_capability( "access", 0 )
     /* use these when open as access_demux fails; VLC will use another demux */