[vlc-commits] demux: ts: rename confusing option seekpp
Francois Cartegnie
git at videolan.org
Thu Nov 10 12:03:30 CET 2016
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Nov 10 11:59:01 2016 +0100| [2ee4ab75afbfe8f7e87edccc6e928ed88782aef1] | committer: Francois Cartegnie
demux: ts: rename confusing option seekpp
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2ee4ab75afbfe8f7e87edccc6e928ed88782aef1
---
modules/demux/mpeg/ts.c | 6 +++---
modules/demux/mpeg/ts.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index f55ee81..f6676da 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -477,7 +477,7 @@ static int Open( vlc_object_t *p_this )
p_sys->b_canseek = false;
p_sys->b_canfastseek = false;
- p_sys->b_force_seek_per_percent = var_InheritBool( p_demux, "ts-seek-percent" );
+ p_sys->b_ignore_time_for_positions = var_InheritBool( p_demux, "ts-seek-percent" );
p_sys->standard = TS_STANDARD_AUTO;
char *psz_standard = var_InheritString( p_demux, "ts-standard" );
@@ -895,7 +895,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
break;
if( p_sys->b_access_control &&
- !p_sys->b_force_seek_per_percent && b_bool && p_pmt )
+ !p_sys->b_ignore_time_for_positions && b_bool && p_pmt )
{
time_t i_time, i_length;
if( !EITCurrentEventTime( p_pmt, p_sys, &i_time, &i_length ) &&
@@ -908,7 +908,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
}
- if( !p_sys->b_force_seek_per_percent && b_bool && p_pmt &&
+ if( !p_sys->b_ignore_time_for_positions && b_bool && p_pmt &&
p_pmt->pcr.i_first > -1 && p_pmt->i_last_dts > VLC_TS_INVALID &&
p_pmt->pcr.i_current > -1 )
{
diff --git a/modules/demux/mpeg/ts.h b/modules/demux/mpeg/ts.h
index 28f8284..55d2755 100644
--- a/modules/demux/mpeg/ts.h
+++ b/modules/demux/mpeg/ts.h
@@ -60,7 +60,7 @@ struct demux_sys_t
/* how many TS packet we read at once */
unsigned i_ts_read;
- bool b_force_seek_per_percent;
+ bool b_ignore_time_for_positions;
ts_standards_e standard;
More information about the vlc-commits
mailing list