mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/controller/gstinterpolation.c: use convert function for uint64/double

Browse source 
Original commit message from CVS:

patch by: Sebastien Moutte

* libs/gst/controller/gstinterpolation.c:
use convert function for uint64/double
* win32/vs6/libgstcontroller.dsp:
link to GLib
This commit is contained in:
Sebastien Moutte 2005-12-04 18:54:19 +00:00 committed by Thomas Vander Stichele
parent 057de1f845
commit 7e0089586b
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-12-04 Thomas Vander Stichele <thomas at apestaart dot org>
patch by: Sebastien Moutte
* libs/gst/controller/gstinterpolation.c:
use convert function for uint64/double
* win32/vs6/libgstcontroller.dsp:
link to GLib
2005-12-04 Thomas Vander Stichele <thomas at apestaart dot org> 2005-12-04 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gstutils.c: (gst_util_guint64_to_gdouble), * gst/gstutils.c: (gst_util_guint64_to_gdouble),

2
libs/gst/controller/gstinterpolation.c
View file

@ -225,7 +225,7 @@ _interpolate_linear_get_##type (GstControlledProperty * prop, GstClockTime times
value2 = g_value_get_##type (&tv2->value); \ value2 = g_value_get_##type (&tv2->value); \
valuediff = (gdouble) (value2 - value1); \ valuediff = (gdouble) (value2 - value1); \
\ \
return ((g##type) (value1 + valuediff * ((timestamp - tv1->timestamp) / timediff))); \ return ((g##type) (value1 + valuediff * (gst_guint64_to_gdouble (timestamp - tv1->timestamp) / timediff))); \
} \ } \
else { \ else { \
return (g_value_get_##type (&tv1->value)); \ return (g_value_get_##type (&tv1->value)); \

4
win32/vs6/libgstcontroller.dsp
View file

@ -52,7 +52,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 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 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib /nologo /dll /machine:I386
!ELSEIF "$(CFG)" == "libgstcontroller - Win32 Debug" !ELSEIF "$(CFG)" == "libgstcontroller - Win32 Debug"
@ -77,7 +77,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 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 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF