Skip to content

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

Bumped up version number of live555 to a ridiculous 9999999999 so it doesn't... 

Bumped up version number of live555 to a ridiculous 9999999999 so it doesn't conflict with the official live555 releases. This is a temporary hack till RTSP seeking is solved properly.
parent dee7ee44
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 8 deletions
extras/contrib/src/Patches/live-starttime.patch
View file @ 4c5d7ce9
...@@ -158,3 +158,15 @@ diff -ruN live.orig/liveMedia/include/RTSPClient.hh live/liveMedia/include/RTSPC ...@@ -158,3 +158,15 @@ diff -ruN live.orig/liveMedia/include/RTSPClient.hh live/liveMedia/include/RTSPC
Boolean parseGetParameterHeader(char const* line, Boolean parseGetParameterHeader(char const* line,
const char* param, const char* param,
char*& value); char*& value);
--- live/liveMedia/include/liveMedia_version.hh 2007-02-20 12:33:45.000000000 +0100
+++ live.new/liveMedia/include/liveMedia_version.hh 2007-03-19 22:06:23.000000000 +0100
@@ -4,7 +4,7 @@
#ifndef _LIVEMEDIA_VERSION_HH
#define _LIVEMEDIA_VERSION_HH
-#define LIVEMEDIA_LIBRARY_VERSION_STRING "2007.02.20"
-#define LIVEMEDIA_LIBRARY_VERSION_INT 1171929600
+#define LIVEMEDIA_LIBRARY_VERSION_STRING "2007.03.19"
+#define LIVEMEDIA_LIBRARY_VERSION_INT 9999999999
#endif
modules/demux/live555.cpp
View file @ 4c5d7ce9
...@@ -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 >= 9999999999)
/* 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
...@@ -857,7 +857,7 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -857,7 +857,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 >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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
...@@ -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 >= 9999999999)
/* 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
...@@ -930,7 +930,7 @@ static int Play( demux_t *p_demux ) ...@@ -930,7 +930,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 >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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
...@@ -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 >= 9999999999)
/* 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
...@@ -1145,7 +1145,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1145,7 +1145,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 >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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
...@@ -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 >= 9999999999)
/* 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
...@@ -1221,7 +1221,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1221,7 +1221,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 >= 1171929600) #if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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