Merge branch 1.0-bugfix

[vlc] / modules / video_output / msw / direct3d.c

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 4503e27165146c8c799d6fbdc9aa5291d39dbf39..7d385468c2b4c0b8540f180f3e649e2d31a71794 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -1028,7 +1028,8 @@ static int Direct3DVoutCreatePictures( vout_thread_t *p_vout, size_t i_num_pics
     HRESULT hr;
     size_t c;
     // if vout is already running, use current chroma, otherwise choose from upstream
-    int i_chroma = p_vout->output.i_chroma ? : p_vout->render.i_chroma;
+    int i_chroma = p_vout->output.i_chroma ? p_vout->output.i_chroma
+                                           : p_vout->render.i_chroma;
 
     I_OUTPUTPICTURES = 0;