[vlc-commits] demux: ps: remove tautology
Francois Cartegnie
git at videolan.org
Fri Mar 31 14:52:07 CEST 2017
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Mar 31 14:32:26 2017 +0200| [e81a9dcabba6aa0a660ccb27a982ba01482713c6] | committer: Francois Cartegnie
demux: ps: remove tautology
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e81a9dcabba6aa0a660ccb27a982ba01482713c6
---
modules/access/dvdnav.c | 2 +-
modules/access/dvdread.c | 2 +-
modules/demux/mpeg/ps.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index c22b080..4e29643 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -1389,7 +1389,7 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
{
ESNew( p_demux, i_id );
}
- if( tk->b_configured && tk->es &&
+ if( tk->es &&
!ps_pkt_parse_pes( VLC_OBJECT(p_demux), p_pkt, tk->i_skip ) )
{
es_out_Send( p_demux->out, tk->es, p_pkt );
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 51e9ef8..a15b713 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -613,7 +613,7 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
{
ESNew( p_demux, i_id, 0 );
}
- if( tk->b_configured && tk->es &&
+ if( tk->es &&
!ps_pkt_parse_pes( VLC_OBJECT(p_demux), p_pkt, tk->i_skip ) )
{
es_out_Send( p_demux->out, tk->es, p_pkt );
diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 84ba513..3d3e497 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -383,7 +383,7 @@ static void NotifyDiscontinuity( ps_track_t *p_tk, es_out_t *out )
for( size_t i = 0; i < PS_TK_COUNT; i++ )
{
ps_track_t *tk = &p_tk[i];
- if( tk->b_configured && tk->es &&
+ if( tk->es &&
es_out_Control( out, ES_OUT_GET_ES_STATE, tk->es, &b_selected ) == VLC_SUCCESS
&& b_selected )
{
More information about the vlc-commits
mailing list