[vlc-commits] XCB/XVideo: do not reject YUYV output when forced

Francois Cartegnie git at videolan.org
Mon Sep 4 20:50:48 CEST 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Sep  4 20:46:33 2017 +0200| [2fd9a5b02b67463661ab1f514c988d6cb7da2153] | committer: Francois Cartegnie

XCB/XVideo: do not reject YUYV output when forced

partially reverts commit 2c1940d7d3d103b19ce329697136bc21ab014754.

fixes #18738

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

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

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 73f41479a3..59b486da7a 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -254,7 +254,7 @@ FindFormat (vlc_object_t *obj, xcb_connection_t *conn, video_format_t *fmt,
             const xcb_xv_adaptor_info_t *a, uint32_t *idp)
 {
     /* Order chromas by preference */
-    vlc_fourcc_t tab[6];
+    vlc_fourcc_t tab[7];
     const vlc_fourcc_t *chromav = tab;
 
     vlc_fourcc_t chroma = var_InheritInteger (obj, "xvideo-format-id");
@@ -274,7 +274,8 @@ FindFormat (vlc_object_t *obj, xcb_connection_t *conn, video_format_t *fmt,
         tab[2] = VLC_CODEC_RGB24;
         tab[3] = VLC_CODEC_RGB16;
         tab[4] = VLC_CODEC_RGB15;
-        tab[5] = 0;
+        tab[5] = (obj->obj.force) ? VLC_CODEC_YUYV : 0;
+        tab[6] = 0;
     }
 
     /* Get available image formats */



More information about the vlc-commits mailing list