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

diff --git a/extras/contrib/src/Patches/live-starttime.patch b/extras/contrib/src/Patches/live-starttime.patch
index 4b24f0a521178d1112b9ea014b89f2d9ba296d1f..dbb143ca31e68668b448aec931d50cc9662b8189 100644 (file)
--- a/extras/contrib/src/Patches/live-starttime.patch
+++ b/extras/contrib/src/Patches/live-starttime.patch
@@ -158,3 +158,15 @@ diff -ruN live.orig/liveMedia/include/RTSPClient.hh live/liveMedia/include/RTSPC
    Boolean parseGetParameterHeader(char const* line, 
                                    const char* param,
                                    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

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 05cd775f6ab1ada4f85b472509f8d87aad97e483..abdaac2a1553e7e616e2cc878778ee9c9c0194e1 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -848,7 +848,7 @@ static int SessionsSetup( demux_t *p_demux )
     delete iter;
     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 */
     p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -857,7 +857,7 @@ static int SessionsSetup( demux_t *p_demux )
     if( p_sys->i_npt_start < 0 )
         p_sys->i_npt_start = -1;
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
     /* Retrieve the duration if possible */
     p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -916,7 +916,7 @@ static int Play( demux_t *p_demux )
     }
 #endif
 
-#if (LIVEMEDIA_LIBRARY_VERSION_INT > 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
     /* Retrieve the starttime if possible */
     p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -930,7 +930,7 @@ static int Play( demux_t *p_demux )
     else
         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 */
     p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -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 );
                 }
 #endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT > 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
                 /* Retrieve the starttime if possible */
                 p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1145,7 +1145,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 else
                     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 */
                 p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else
@@ -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 );
             }
 #endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT > 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
             /* Retrieve the starttime if possible */
             p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
 #else
@@ -1221,7 +1221,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             else
                 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 */
             p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
 #else