[vlc-commits] Skip output-only XVideo adapters

Rémi Denis-Courmont git at videolan.org
Tue Oct 4 22:56:17 CEST 2011


vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct  4 23:52:42 2011 +0300| [b9ebabd7412c5b1b9447109ab259579f5687ce4d] | committer: Rémi Denis-Courmont

Skip output-only XVideo adapters

We need PutImage meaning the Input and the Image bits in type mask.
Output adapters are rather rare (the _exotic_ Xorg V4L2 driver is one).
(cherry picked from commit 6b389f7b27df05ba4700a1b5f578d643782238aa)

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

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

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index d899a17..1afccfd 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -359,7 +359,8 @@ static int Open (vlc_object_t *obj)
             continue;
         }
 
-        if (!(a->type & XCB_XV_TYPE_IMAGE_MASK))
+        if (!(a->type & XCB_XV_TYPE_INPUT_MASK)
+         || !(a->type & XCB_XV_TYPE_IMAGE_MASK))
             continue;
 
         xcb_xv_list_image_formats_reply_t *r =



More information about the vlc-commits mailing list