vlc/vlc-1.2 | branch: master | Rafaël Carré <[email protected]> | Sun Dec 4 00:16:59 2011 -0500| [9158ea1ebb179897d98264fc476eeed310b57d97] | committer: Jean-Baptiste Kempf
ps_psm_fill: fix logic bug spotted by clang (cherry picked from commit 415c1ab48a995b17c81f2be5d344bdb0499efbd7) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=9158ea1ebb179897d98264fc476eeed310b57d97 --- modules/demux/ps.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/ps.h b/modules/demux/ps.h index 674c365..939d04c 100644 --- a/modules/demux/ps.h +++ b/modules/demux/ps.h @@ -584,8 +584,8 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt, i_length = (uint16_t)(p_buffer[4] << 8) + p_buffer[5] + 6; if( i_length > i_buffer ) return VLC_EGENERIC; - //i_current_next_indicator = (p_buffer[6] && 0x01); - i_version = (p_buffer[6] && 0xf8); + //i_current_next_indicator = (p_buffer[6] & 0x01); + i_version = (p_buffer[6] & 0xf8); if( p_psm->i_version == i_version ) return VLC_EGENERIC; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
