diff options
author | Sébastien Moutte <sebastien@moutte.net> | 2006-04-09 17:31:37 +0000 |
---|---|---|
committer | Sébastien Moutte <sebastien@moutte.net> | 2006-04-09 17:31:37 +0000 |
commit | a48bb4f8f2d1b417074c2005b09b8421fb3e3534 (patch) | |
tree | 853bdf5494b732b8975a784717e2cd752b2dd612 | |
parent | f66a4fbe55c65cdcee436403dfed3831c46ba4a4 (diff) |
gst/level/gstlevel.c: use G_GINT64_CONSTANT for INT64 constants
Original commit message from CVS:
* gst/level/gstlevel.c: (gst_level_set_caps),(gst_level_transform_ip):
use G_GINT64_CONSTANT for INT64 constants
* gst/videofilter/gstvideobalance.c:
define rint for WIN32 #define rint(x) (floor((x)+0.5))
* win32/vs6/libgstavi.dsp:
add missing libraries for the link and remove avimux.c from
the project as it isn't ported to 0.10 yet
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | gst/level/gstlevel.c | 4 | ||||
-rw-r--r-- | gst/videofilter/gstvideobalance.c | 4 | ||||
-rw-r--r-- | win32/vs6/libgstavi.dsp | 13 |
4 files changed, 19 insertions, 12 deletions
@@ -1,3 +1,13 @@ +2006-04-09 Sebastien Moutte <sebastien@moutte.net> + + * gst/level/gstlevel.c: (gst_level_set_caps),(gst_level_transform_ip): + use G_GINT64_CONSTANT for INT64 constants + * gst/videofilter/gstvideobalance.c: + define rint for WIN32 #define rint(x) (floor((x)+0.5)) + * win32/vs6/libgstavi.dsp: + add missing libraries for the link and remove avimux.c from + the project as it isn't ported to 0.10 yet + 2006-04-09 Tim-Philipp Müller <tim at centricular dot net> * gst/matroska/ebml-read.c: (gst_ebml_read_sint): diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index d20a8462..a9c6ffbc 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -322,7 +322,7 @@ gst_level_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out) for (i = 0; i < filter->channels; ++i) { filter->CS[i] = filter->peak[i] = filter->last_peak[i] = filter->decay_peak[i] = filter->decay_peak_base[i] = 0.0; - filter->decay_peak_age[i] = 0L; + filter->decay_peak_age[i] = G_GINT64_CONSTANT (0); } return TRUE; @@ -509,7 +509,7 @@ gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in) GST_LOG_OBJECT (filter, "new peak, %f", filter->peak[i]); filter->decay_peak[i] = filter->peak[i]; filter->decay_peak_base[i] = filter->peak[i]; - filter->decay_peak_age[i] = 0L; + filter->decay_peak_age[i] = G_GINT64_CONSTANT (0); } } diff --git a/gst/videofilter/gstvideobalance.c b/gst/videofilter/gstvideobalance.c index cd8ba432..b7972bf3 100644 --- a/gst/videofilter/gstvideobalance.c +++ b/gst/videofilter/gstvideobalance.c @@ -60,6 +60,10 @@ #define M_PI 3.14159265358979323846 #endif +#ifdef WIN32 +#define rint(x) (floor((x)+0.5)) +#endif + static GstElementDetails video_balance_details = GST_ELEMENT_DETAILS ("Video balance", "Filter/Effect/Video", diff --git a/win32/vs6/libgstavi.dsp b/win32/vs6/libgstavi.dsp index 902351f0..36ac93ba 100644 --- a/win32/vs6/libgstavi.dsp +++ b/win32/vs6/libgstavi.dsp @@ -54,7 +54,8 @@ 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" +# 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" +# SUBTRACT LINK32 /incremental:yes # Begin Special Build Tool TargetPath=.\Release\libgstavi.dll SOURCE="$(InputPath)" @@ -86,7 +87,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" +# 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" # Begin Special Build Tool TargetPath=.\Debug\libgstavi.dll SOURCE="$(InputPath)" @@ -110,10 +111,6 @@ SOURCE=..\..\gst\avi\gstavi.c SOURCE=..\..\gst\avi\gstavidemux.c # End Source File -# Begin Source File - -SOURCE=..\..\gst\avi\gstavimux.c -# End Source File # End Group # Begin Group "Header Files" @@ -126,10 +123,6 @@ SOURCE="..\..\gst\avi\avi-ids.h" SOURCE=..\..\gst\avi\gstavidemux.h # End Source File -# Begin Source File - -SOURCE=..\..\gst\avi\gstavimux.h -# End Source File # End Group # Begin Group "Resource Files" |