Menu
▾
▴
[gst-cvs] tpm gst-plugins-base: gst-plugins-base/ gst-plugins-base/gst-libs/gst/rtp/ gst-plugins-base/win32/vs6/
|
From: <tp...@ke...> - 2007-11-06 23:35:50
|
CVS Root: /cvs/gstreamer
Module: gst-plugins-base
Changes by: tpm
Date: Tue Nov 06 2007 23:35:53 UTC
Log message:
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).
Modified files:
. : ChangeLog
gst-libs/gst/rtp: gstrtcpbuffer.c gstrtppayloads.c
win32/vs6 : gst_plugins_base.dsw libgstaudio.dsp
libgstrtp.dsp libgsttag.dsp
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3592&r2=1.3593
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstrtcpbuffer.c.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstrtppayloads.c.diff?r1=1.4&r2=1.5
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/win32/vs6/gst_plugins_base.dsw.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/win32/vs6/libgstaudio.dsp.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/win32/vs6/libgstrtp.dsp.diff?r1=1.6&r2=1.7
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/win32/vs6/libgsttag.dsp.diff?r1=1.6&r2=1.7
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.3592
retrieving revision 1.3593
diff -u -d -r1.3592 -r1.3593
--- ChangeLog 6 Nov 2007 16:38:47 -0000 1.3592
+++ ChangeLog 6 Nov 2007 23:35:37 -0000 1.3593
@@ -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...@ta...>
* win32/common/libgstaudio.def:
Index: gstrtcpbuffer.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstrtcpbuffer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstrtcpbuffer.c 17 Sep 2007 17:24:54 -0000 1.8
+++ gstrtcpbuffer.c 6 Nov 2007 23:35:38 -0000 1.9
@@ -1637,9 +1637,11 @@
/* 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 @@
/* 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;
Index: gstrtppayloads.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/rtp/gstrtppayloads.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gstrtppayloads.c 10 Oct 2007 09:37:09 -0000 1.4
+++ gstrtppayloads.c 6 Nov 2007 23:35:39 -0000 1.5
@@ -220,7 +220,7 @@
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;
}
Index: gst_plugins_base.dsw
RCS file: /cvs/gstreamer/gst-plugins-base/win32/vs6/gst_plugins_base.dsw,v
--- gst_plugins_base.dsw 29 Sep 2007 12:04:01 -0000 1.8
+++ gst_plugins_base.dsw 6 Nov 2007 23:35:39 -0000 1.9
@@ -144,6 +144,18 @@
###############################################################################
+Project: "libgstfft"=".\libgstfft.dsp" - Package Owner=<4>
+Package=<5>
+{{{
+}}}
+Package=<4>
+###############################################################################
Project: "libgstgdp"=".\libgstgdp.dsp" - Package Owner=<4>
Package=<5>
Index: libgstaudio.dsp
RCS file: /cvs/gstreamer/gst-plugins-base/win32/vs6/libgstaudio.dsp,v
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libgstaudio.dsp 5 Jun 2007 12:50:24 -0000 1.5
+++ libgstaudio.dsp 6 Nov 2007 23:35:39 -0000 1.6
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# 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
-# 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"
+# 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"
# Begin Special Build Tool
TargetPath=.\Release\libgstaudio-0.10.dll
SOURCE="$(InputPath)"
@@ -86,7 +86,7 @@
# 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
-# 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"
+# 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"
TargetPath=.\Debug\libgstaudio-0.10.dll
@@ -144,6 +144,10 @@
# End Source File
# Begin Source File
+SOURCE="..\..\gst-libs\gst\audio\mixerutils.c"
+# End Source File
+# Begin Source File
SOURCE="..\..\gst-libs\gst\audio\multichannel-enumtypes.c"
Index: libgstrtp.dsp
RCS file: /cvs/gstreamer/gst-plugins-base/win32/vs6/libgstrtp.dsp,v
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libgstrtp.dsp 5 Jun 2007 12:50:24 -0000 1.6
+++ libgstrtp.dsp 6 Nov 2007 23:35:39 -0000 1.7
@@ -116,10 +116,18 @@
+SOURCE="..\..\gst-libs\gst\rtp\gstrtcpbuffer.c"
+# End Source File
+# Begin Source File
SOURCE="..\..\gst-libs\gst\rtp\gstrtpbuffer.c"
+SOURCE="..\..\gst-libs\gst\rtp\gstrtppayloads.c"
+
SOURCE=..\common\libgstrtp.def
# End Group
Index: libgsttag.dsp
RCS file: /cvs/gstreamer/gst-plugins-base/win32/vs6/libgsttag.dsp,v
--- libgsttag.dsp 5 Jun 2007 12:50:24 -0000 1.6
+++ libgsttag.dsp 6 Nov 2007 23:35:39 -0000 1.7
@@ -108,6 +108,10 @@
+SOURCE="..\..\gst-libs\gst\tag\gsttagdemux.c"
SOURCE="..\..\gst-libs\gst\tag\gstvorbistag.c"
|