mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 02:36:13 +00:00
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).
This commit is contained in:
Sebastien Moutte
Tim-Philipp Müller
parent
e668c5be70
commit
13d89656c0
7 changed files with 55 additions and 7 deletions
16
ChangeLog
16
ChangeLog
|
|
@ -1,3 +1,19 @@
|
|||
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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -144,6 +144,18 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "libgstfft"=".\libgstfft.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "libgstgdp"=".\libgstgdp.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ BSC32=bscmake.exe
|
|||
# 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 @@ BSC32=bscmake.exe
|
|||
# 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 /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"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Debug\libgstaudio-0.10.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
@ -144,6 +144,10 @@ SOURCE=..\common\libgstaudio.def
|
|||
# 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"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
|
|
@ -116,10 +116,18 @@ SOURCE="..\..\gst-libs\gst\rtp\gstbasertppayload.c"
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE="..\..\gst-libs\gst\rtp\gstrtcpbuffer.c"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE="..\..\gst-libs\gst\rtp\gstrtpbuffer.c"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE="..\..\gst-libs\gst\rtp\gstrtppayloads.c"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\common\libgstrtp.def
|
||||
# End Source File
|
||||
# End Group
|
||||
|
|
|
|||
|
|
@ -108,6 +108,10 @@ SOURCE="..\..\gst-libs\gst\tag\gstid3tag.c"
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE="..\..\gst-libs\gst\tag\gsttagdemux.c"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE="..\..\gst-libs\gst\tag\gstvorbistag.c"
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
Loading…
Reference in a new issue