gst-libs/gst/rtp/: Fix some C99-isms and and a missing function that some versions of

Original commit message from CVS:
Patch by: Sebastien Moutte  <sebastien moutte net>
* gst-libs/gst/rtp/gstrtcpbuffer.c: (gst_rtcp_ntp_to_unix),
(gst_rtcp_unix_to_ntp):
* gst-libs/gst/rtp/gstrtppayloads.c: (gst_rtp_payload_info_for_name):
Fix some C99-isms and and a missing function that some versions of
MSVC don't like too much (#494346).
* win32/vs6/gst_plugins_base.dsw:
* win32/vs6/libgstaudio.dsp:
* win32/vs6/libgstrtp.dsp:
* win32/vs6/libgsttag.dsp:
Update vs6 projects files (#494346).

diff --git a/ChangeLog b/ChangeLog
index 9b340e3..0ddf9c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2007-11-06  Tim-Philipp Müller  <tim at centricular dot net>
 
+       Patch by: Sebastien Moutte  <sebastien moutte net>
+
+       * gst-libs/gst/rtp/gstrtcpbuffer.c: (gst_rtcp_ntp_to_unix),
+         (gst_rtcp_unix_to_ntp):
+       * gst-libs/gst/rtp/gstrtppayloads.c: (gst_rtp_payload_info_for_name):
+         Fix some C99-isms and and a missing function that some versions of
+         MSVC don't like too much (#494346).
+
+       * win32/vs6/gst_plugins_base.dsw:
+       * win32/vs6/libgstaudio.dsp:
+       * win32/vs6/libgstrtp.dsp:
+       * win32/vs6/libgsttag.dsp:
+         Update vs6 projects files (#494346).
+
+2007-11-06  Tim-Philipp Müller  <tim at centricular dot net>
+
        Patch by: Ole André Vadla Ravnås  <ole.andre.ravnas@tandberg.com>
 
        * win32/common/libgstaudio.def:

diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.c b/gst-libs/gst/rtp/gstrtcpbuffer.c
index e2847c9..6804531 100644 (file)
--- a/gst-libs/gst/rtp/gstrtcpbuffer.c
+++ b/gst-libs/gst/rtp/gstrtcpbuffer.c
@@ -1637,9 +1637,11 @@ gst_rtcp_ntp_to_unix (guint64 ntptime)
 
   /* conversion from NTP timestamp (seconds since 1900) to seconds since
    * 1970. */
-  unixtime = ntptime - (2208988800ULL << 32);
+  unixtime = ntptime - (G_GUINT64_CONSTANT (2208988800) << 32);
   /* conversion to nanoseconds */
-  unixtime = gst_util_uint64_scale (unixtime, GST_SECOND, (1LL << 32));
+  unixtime =
+      gst_util_uint64_scale (unixtime, GST_SECOND,
+      (G_GINT64_CONSTANT (1) << 32));
 
   return unixtime;
 }
@@ -1663,10 +1665,12 @@ gst_rtcp_unix_to_ntp (guint64 unixtime)
 
   /* convert clock time to NTP time. upper 32 bits should contain the seconds
    * and the lower 32 bits, the fractions of a second. */
-  ntptime = gst_util_uint64_scale (unixtime, (1LL << 32), GST_SECOND);
+  ntptime =
+      gst_util_uint64_scale (unixtime, (G_GINT64_CONSTANT (1) << 32),
+      GST_SECOND);
   /* conversion from UNIX timestamp (seconds since 1970) to NTP (seconds
    * since 1900). */
-  ntptime += (2208988800ULL << 32);
+  ntptime += (G_GUINT64_CONSTANT (2208988800) << 32);
 
   return ntptime;
 }

diff --git a/gst-libs/gst/rtp/gstrtppayloads.c b/gst-libs/gst/rtp/gstrtppayloads.c
index 3b6d851..60ac5b5 100644 (file)
--- a/gst-libs/gst/rtp/gstrtppayloads.c
+++ b/gst-libs/gst/rtp/gstrtppayloads.c
@@ -220,7 +220,7 @@ gst_rtp_payload_info_for_name (const gchar * media, const gchar * encoding_name)
 
   for (i = 0; info[i].media; i++) {
     if (strcmp (media, info[i].media) == 0
-        && strcasecmp (encoding_name, info[i].encoding_name) == 0) {
+        && g_strcasecmp (encoding_name, info[i].encoding_name) == 0) {
       result = &info[i];
       break;
     }

diff --git a/win32/vs6/gst_plugins_base.dsw b/win32/vs6/gst_plugins_base.dsw
index 8010d8e..2145e96 100644 (file)
--- a/win32/vs6/gst_plugins_base.dsw
+++ b/win32/vs6/gst_plugins_base.dsw
@@ -144,6 +144,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "libgstfft"=".\libgstfft.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "libgstgdp"=".\libgstgdp.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r

diff --git a/win32/vs6/libgstaudio.dsp b/win32/vs6/libgstaudio.dsp
index 1176636..e50b3c9 100644 (file)
--- a/win32/vs6/libgstaudio.dsp
+++ b/win32/vs6/libgstaudio.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /out:"Release/libgstaudio-0.10.dll" /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release"\r
+# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib /nologo /dll /machine:I386 /out:"Release/libgstaudio-0.10.dll" /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release"\r
 # Begin Special Build Tool\r
 TargetPath=.\Release\libgstaudio-0.10.dll\r
 SOURCE="$(InputPath)"\r
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstaudio-0.10.dll" /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug"\r
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstinterfaces-0.10.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstaudio-0.10.dll" /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug"\r
 # Begin Special Build Tool\r
 TargetPath=.\Debug\libgstaudio-0.10.dll\r
 SOURCE="$(InputPath)"\r
@@ -144,6 +144,10 @@ SOURCE=..\common\libgstaudio.def
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE="..\..\gst-libs\gst\audio\mixerutils.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\gst-libs\gst\audio\multichannel-enumtypes.c"\r
 # End Source File\r
 # Begin Source File\r

diff --git a/win32/vs6/libgstrtp.dsp b/win32/vs6/libgstrtp.dsp
index 0874138..488cadc 100644 (file)
--- a/win32/vs6/libgstrtp.dsp
+++ b/win32/vs6/libgstrtp.dsp
@@ -116,10 +116,18 @@ SOURCE="..\..\gst-libs\gst\rtp\gstbasertppayload.c"
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE="..\..\gst-libs\gst\rtp\gstrtcpbuffer.c"\r
+# End Source File\r
+# Begin Source File\r
+
 SOURCE="..\..\gst-libs\gst\rtp\gstrtpbuffer.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE="..\..\gst-libs\gst\rtp\gstrtppayloads.c"\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\common\libgstrtp.def\r
 # End Source File\r
 # End Group\r

diff --git a/win32/vs6/libgsttag.dsp b/win32/vs6/libgsttag.dsp
index c92c85c..cc4df5b 100644 (file)
--- a/win32/vs6/libgsttag.dsp
+++ b/win32/vs6/libgsttag.dsp
@@ -108,6 +108,10 @@ SOURCE="..\..\gst-libs\gst\tag\gstid3tag.c"
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE="..\..\gst-libs\gst\tag\gsttagdemux.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\gst-libs\gst\tag\gstvorbistag.c"\r
 # End Source File\r
 # Begin Source File\r