[vlc-devel] commit: Enable XCB XVideo ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 16 22:30:28 2009 +0300| [16a5d32a9e5570bbf7c5c406e972228d82619c88] | committer: Rémi Denis-Courmont 

Enable XCB XVideo

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

 modules/video_output/wrapper.c    |    2 +-
 modules/video_output/xcb/xvideo.c |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/wrapper.c b/modules/video_output/wrapper.c
index 0dddd91..44dddb6 100644
--- a/modules/video_output/wrapper.c
+++ b/modules/video_output/wrapper.c
@@ -76,7 +76,7 @@ vlc_module_begin()
     DECLARE_MODULE(xcb, 75)
 
     add_submodule()
-    DECLARE_MODULE(xcb_xv, 0)
+    DECLARE_MODULE(xcb_xv, 155)
 
 vlc_module_end()
 
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 3a69688..7f752d9 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -55,16 +55,19 @@ static void Close (vlc_object_t *);
  */
 vlc_module_begin ()
     set_shortname (N_("XVideo"))
-    set_description (N_("(Experimental) XVideo output"))
+    set_description (N_("XVideo output (XCB)"))
     set_category (CAT_VIDEO)
     set_subcategory (SUBCAT_VIDEO_VOUT)
-    set_capability ("vout display", 0)
+    set_capability ("vout display", 155)
     set_callbacks (Open, Close)
 
     add_string ("x11-display", NULL, NULL,
                 DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
+        add_deprecated_alias ("xvideo-display")
     add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true)
+        add_deprecated_alias ("xvideo-shm")
     add_shortcut ("xcb-xv")
+    add_shortcut ("xv")
 vlc_module_end ()
 
 #define MAX_PICTURES (VOUT_MAX_PICTURES)