[vlc-devel] [PATCH] demux/avi: remove short ternary which is a GNU extension

Marvin Scholz epirat07 at gmail.com
Wed Jul 17 10:51:02 CEST 2019


---
 modules/demux/avi/bitmapinfoheader.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/avi/bitmapinfoheader.h b/modules/demux/avi/bitmapinfoheader.h
index 9a88fffdef..e1ccca9722 100644
--- a/modules/demux/avi/bitmapinfoheader.h
+++ b/modules/demux/avi/bitmapinfoheader.h
@@ -246,7 +246,8 @@ static inline VLC_BITMAPINFOHEADER * CreateBitmapInfoHeader( const es_format_t *
             biCompression = VLC_FOURCC( 'X', 'V', 'I', 'D' );
             break;
         default:
-            biCompression = fmt->i_original_fourcc ?: fmt->i_codec;
+            biCompression = (fmt->i_original_fourcc)
+                ? fmt->i_original_fourcc : fmt->i_codec;
             break;
     }
 
-- 
2.20.1 (Apple Git-117)



More information about the vlc-devel mailing list