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

Rémi Denis-Courmont git at videolan.org
Wed Sep 6 18:11:01 CEST 2017


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Sep  6 19:09:27 2017 +0300| [a9712a7e4fba854fceab8ce5f232b6baf05dc39c] | committer: Rémi Denis-Courmont

Revert "XCB/XVideo: do not reject YUYV output when forced"

This reverts commit 2fd9a5b02b67463661ab1f514c988d6cb7da2153.
Fixes #18778.

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

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

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 59b486da7a..73f41479a3 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[7];
+    vlc_fourcc_t tab[6];
     const vlc_fourcc_t *chromav = tab;
 
     vlc_fourcc_t chroma = var_InheritInteger (obj, "xvideo-format-id");
@@ -274,8 +274,7 @@ 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] = (obj->obj.force) ? VLC_CODEC_YUYV : 0;
-        tab[6] = 0;
+        tab[5] = 0;
     }
 
     /* Get available image formats */



More information about the vlc-commits mailing list