Skip to content

V
vlc-1.1
Commit 71413887 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Replaced LIVEMEDIA_LIBRARY_VERSION_INT version 9999999999 with 1199404800.

parent 3c164b33
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/demux/live555.cpp
View file @ 71413887
...@@ -937,7 +937,7 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -937,7 +937,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 >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* 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
...@@ -946,7 +946,7 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -946,7 +946,7 @@ static int SessionsSetup( demux_t *p_demux )
if( p_sys->i_npt_start < 0 ) if( p_sys->i_npt_start < 0 )
p_sys->i_npt_start = -1; p_sys->i_npt_start = -1;
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the duration if possible */ /* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
#else #else
...@@ -1007,7 +1007,7 @@ static int Play( demux_t *p_demux ) ...@@ -1007,7 +1007,7 @@ static int Play( demux_t *p_demux )
} }
#endif #endif
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* 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
...@@ -1021,7 +1021,7 @@ static int Play( demux_t *p_demux ) ...@@ -1021,7 +1021,7 @@ static int Play( demux_t *p_demux )
else else
p_sys->i_npt = p_sys->i_npt_start; p_sys->i_npt = p_sys->i_npt_start;
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the duration if possible */ /* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
#else #else
...@@ -1226,7 +1226,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1226,7 +1226,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq ); msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq );
} }
#endif #endif
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* 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
...@@ -1240,7 +1240,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1240,7 +1240,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
else else
p_sys->i_npt = p_sys->i_npt_start; p_sys->i_npt = p_sys->i_npt_start;
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the duration if possible */ /* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
#else #else
...@@ -1367,7 +1367,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1367,7 +1367,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq ); msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq );
} }
#endif #endif
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* 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
...@@ -1381,7 +1381,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1381,7 +1381,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
else else
p_sys->i_npt = p_sys->i_npt_start; p_sys->i_npt = p_sys->i_npt_start;
#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the duration if possible */ /* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (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