From c29660156f9df242656463cdf8af035457dc94c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Moutte?= Date: Thu, 7 Feb 2008 19:25:08 +0000 Subject: [PATCH] gst/mpegaudioparse/gstmpegaudioparse.c: Use gst_guint64_to_gdouble for conversion Original commit message from CVS: * gst/mpegaudioparse/gstmpegaudioparse.c:(mp3parse_time_to_bytepos): Use gst_guint64_to_gdouble for conversion * win32/vs6/libgstasfdemux.dsp: * win32/vs6/libgstdvdsub.dsp: * win32/vs6/libgstrealmedia.dsp: Update project dependencies and add new source files --- ChangeLog | 9 +++++++++ common | 2 +- gst/mpegaudioparse/gstmpegaudioparse.c | 2 +- win32/vs6/libgstasfdemux.dsp | 8 ++++++-- win32/vs6/libgstdvdsub.dsp | 4 ++++ win32/vs6/libgstrealmedia.dsp | 20 ++++++++++++++++++-- 6 files changed, 39 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b138ec9a1c..135c0627b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-02-07 Sebastien Moutte + + * gst/mpegaudioparse/gstmpegaudioparse.c:(mp3parse_time_to_bytepos): + Use gst_guint64_to_gdouble for conversion + * win32/vs6/libgstasfdemux.dsp: + * win32/vs6/libgstdvdsub.dsp: + * win32/vs6/libgstrealmedia.dsp: + Update project dependencies and add new source files + 2008-02-04 Zaheer Abbas Merali * ext/mpeg2dec/gstmpeg2dec.c: diff --git a/common b/common index 3c5473161c..8b37d7ee83 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 3c5473161ce19a3530bad279b842d542895b1500 +Subproject commit 8b37d7ee833fab1d25b484d8574df3dae231b5f2 diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index b441fb0c2d..99ffb59d8e 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -1393,7 +1393,7 @@ mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts, fb = total_bytes; } - *bytepos = fa + ((fb - fa) / (b - a)) * (ts - a); + *bytepos = fa + ((fb - fa) / (b - a)) * (gst_guint64_to_gdouble (ts) - a); return TRUE; } diff --git a/win32/vs6/libgstasfdemux.dsp b/win32/vs6/libgstasfdemux.dsp index 268c806f1e..e3559b1545 100644 --- a/win32/vs6/libgstasfdemux.dsp +++ b/win32/vs6/libgstasfdemux.dsp @@ -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 libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" # Begin Special Build Tool TargetPath=.\Release\libgstasfdemux.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 libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" +# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstriff-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" # Begin Special Build Tool TargetPath=.\Debug\libgstasfdemux.dll SOURCE="$(InputPath)" @@ -118,6 +118,10 @@ SOURCE=..\..\gst\asfdemux\gstasf.c SOURCE=..\..\gst\asfdemux\gstasfdemux.c # End Source File +# Begin Source File + +SOURCE=..\..\gst\asfdemux\gstrtspwms.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/win32/vs6/libgstdvdsub.dsp b/win32/vs6/libgstdvdsub.dsp index d444ca6f86..26d9de1627 100644 --- a/win32/vs6/libgstdvdsub.dsp +++ b/win32/vs6/libgstdvdsub.dsp @@ -106,6 +106,10 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 SOURCE=..\..\gst\dvdsub\gstdvdsubdec.c # End Source File +# Begin Source File + +SOURCE=..\..\gst\dvdsub\gstdvdsubparse.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/win32/vs6/libgstrealmedia.dsp b/win32/vs6/libgstrealmedia.dsp index 4453e30228..7138d83881 100644 --- a/win32/vs6/libgstrealmedia.dsp +++ b/win32/vs6/libgstrealmedia.dsp @@ -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 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" # Begin Special Build Tool TargetPath=.\Release\libgstrealmedia.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 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" +# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtsp-0.10.lib libgstsdp-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" # Begin Special Build Tool TargetPath=.\Debug\libgstrealmedia.dll SOURCE="$(InputPath)" @@ -104,6 +104,10 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\gst\realmedia\asmrules.c +# End Source File +# Begin Source File + SOURCE=..\..\gst\realmedia\rademux.c # End Source File # Begin Source File @@ -112,12 +116,24 @@ SOURCE=..\..\gst\realmedia\rdtdepay.c # End Source File # Begin Source File +SOURCE=..\..\gst\realmedia\rdtmanager.c +# End Source File +# Begin Source File + +SOURCE=..\..\gst\realmedia\realhash.c +# End Source File +# Begin Source File + SOURCE=..\..\gst\realmedia\rmdemux.c # End Source File # Begin Source File SOURCE=..\..\gst\realmedia\rmutils.c # End Source File +# Begin Source File + +SOURCE=..\..\gst\realmedia\rtspreal.c +# End Source File # End Group # Begin Group "Header Files"