vlc | branch: master | Marvin Scholz <[email protected]> | Wed Jul 17 10:51:02 2019 +0200| [3d3dd9a4de86d4d7bfacf37abdc99491706e4bc5] | committer: Marvin Scholz
demux/avi: remove short ternary which is a GNU extension > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3d3dd9a4de86d4d7bfacf37abdc99491706e4bc5 --- 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..ef119bd270 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; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
