git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05ceb79
)
PS: kill a warning about operator precedence
author
Jean-Baptiste Kempf
<jb@videolan.org>
Sat, 9 Aug 2014 19:48:42 +0000
(21:48 +0200)
committer
Jean-Baptiste Kempf
<jb@videolan.org>
Sat, 9 Aug 2014 19:48:42 +0000
(21:48 +0200)
modules/demux/ps.h
patch
|
blob
|
history
diff --git
a/modules/demux/ps.h
b/modules/demux/ps.h
index
6df7ecd
..
ba5fe90
100644
(file)
--- 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 );
}