Skip to content

V
vlc-1.1
Commit dee7ee44 authored by Antoine Cellerier's avatar Antoine Cellerier
Browse files
Options

Fix compilation on debian sid. Please check that we're using the appropriate... 

Fix compilation on debian sid. Please check that we're using the appropriate version numbers in the #ifs.
parent 4b4b52b4
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/demux/live555.cpp
View file @ dee7ee44
...@@ -848,7 +848,7 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -848,7 +848,7 @@ static int SessionsSetup( demux_t *p_demux )
delete iter; delete iter;
if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC; if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC;
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT > 1171929600)
/* Retrieve the starttime if possible */ /* Retrieve the starttime if possible */
p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
#else #else
...@@ -916,7 +916,7 @@ static int Play( demux_t *p_demux ) ...@@ -916,7 +916,7 @@ static int Play( demux_t *p_demux )
} }
#endif #endif
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT > 1171929600)
/* Retrieve the starttime if possible */ /* Retrieve the starttime if possible */
p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
#else #else
...@@ -1131,7 +1131,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1131,7 +1131,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
msg_Dbg( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq ); msg_Dbg( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq );
} }
#endif #endif
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT > 1171929600)
/* Retrieve the starttime if possible */ /* Retrieve the starttime if possible */
p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
#else #else
...@@ -1207,7 +1207,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1207,7 +1207,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
msg_Dbg( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq ); msg_Dbg( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq );
} }
#endif #endif
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT > 1171929600)
/* Retrieve the starttime if possible */ /* Retrieve the starttime if possible */
p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment