vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Sat Aug 9 21:48:42 2014 +0200| [f34e491cb21f1a1f97f4f31b519aa7739a9b48c2] | committer: Jean-Baptiste Kempf
PS: kill a warning about operator precedence > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f34e491cb21f1a1f97f4f31b519aa7739a9b48c2 --- modules/demux/ps.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/ps.h b/modules/demux/ps.h index 6df7ecd..ba5fe90 100644 --- a/modules/demux/ps.h +++ b/modules/demux/ps.h @@ -132,8 +132,8 @@ static inline int ps_track_fill( ps_track_t *tk, ps_psm_t *p_psm, int i_id ) else if( (i_id&0xff00) == 0xfd00 ) /* 0xFD00 -> 0xFDFF */ { uint8_t i_sub_id = i_id & 0xff; - if( i_sub_id >= 0x55 && i_sub_id <= 0x5f || /* Can be primary VC-1 in evob */ - i_sub_id >= 0x75 && i_sub_id <= 0x7f ) /* Secondary VC-1 */ + if( ( i_sub_id >= 0x55 && i_sub_id <= 0x5f ) || /* Can be primary VC-1 in evob */ + ( i_sub_id >= 0x75 && i_sub_id <= 0x7f ) ) /* Secondary VC-1 */ { es_format_Init( &tk->fmt, VIDEO_ES, VLC_CODEC_VC1 ); } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
