From 32df418b1e9634b8a4dff101614f9af43a25cce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sun, 15 May 2005 16:30:32 +0000
Subject: Another batch of gcc-4.0 fixes (#304180).

Original commit message from CVS:
* ext/directfb/directfbvideosink.c:
(gst_directfbvideosink_sink_link):
* ext/libcaca/gstcacasink.c: (gst_cacasink_sinkconnect):
* gst/modplug/libmodplug/sndfile.cpp:
* gst/modplug/libmodplug/sndfile.h:
Another batch of gcc-4.0 fixes (#304180).
---
 ChangeLog                          | 9 +++++++++
 ext/directfb/directfbvideosink.c   | 2 +-
 gst/modplug/libmodplug/sndfile.cpp | 6 ++++--
 gst/modplug/libmodplug/sndfile.h   | 1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4fc297b6..8abc1115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-15  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/directfb/directfbvideosink.c:
+	(gst_directfbvideosink_sink_link):
+	* ext/libcaca/gstcacasink.c: (gst_cacasink_sinkconnect):
+	* gst/modplug/libmodplug/sndfile.cpp:
+	* gst/modplug/libmodplug/sndfile.h:
+	  Another batch of gcc-4.0 fixes (#304180).
+
 2005-05-14  David Schleef  <ds@schleef.org>
 
 	* sys/glsink/glimagesink.c: And remember to set the context
diff --git a/ext/directfb/directfbvideosink.c b/ext/directfb/directfbvideosink.c
index 32719539..dffa4232 100644
--- a/ext/directfb/directfbvideosink.c
+++ b/ext/directfb/directfbvideosink.c
@@ -312,7 +312,7 @@ gst_directfbvideosink_sink_link (GstPad * pad, const GstCaps * caps)
     }
   } else if (g_ascii_strcasecmp (gst_structure_get_name (structure),
           "video/x-raw-yuv") == 0) {
-    gint im_format = 0;
+    guint32 im_format = 0;
 
     gst_structure_get_fourcc (structure, "format", &im_format);
     GST_DEBUG_OBJECT (directfbvideosink,
diff --git a/gst/modplug/libmodplug/sndfile.cpp b/gst/modplug/libmodplug/sndfile.cpp
index b65a1134..9d04556f 100644
--- a/gst/modplug/libmodplug/sndfile.cpp
+++ b/gst/modplug/libmodplug/sndfile.cpp
@@ -1175,7 +1175,8 @@ UINT CSoundFile::ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR lpMemFile,
 			short int *pSample = (short int *)pIns->pSample;
 			for (UINT j=0; j<len; j+=2)
 			{
-			        *pSample++ = bswapLE16(*pSample);
+			        *pSample = bswapLE16(*pSample);
+				++pSample;
 			}
 		}
 		break;
@@ -1366,7 +1367,8 @@ UINT CSoundFile::ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR lpMemFile,
 			WORD *pSampleW = (WORD *)pIns->pSample;
 			for (UINT j=0; j<len; j+=2)   // swaparoni!
 			{
-			        *pSampleW++ = bswapLE16(*pSampleW);
+			        *pSampleW = bswapLE16(*pSampleW);
+			        ++pSampleW;
 			}
 		}
 		break;
diff --git a/gst/modplug/libmodplug/sndfile.h b/gst/modplug/libmodplug/sndfile.h
index 0fe6f459..2e95edcd 100644
--- a/gst/modplug/libmodplug/sndfile.h
+++ b/gst/modplug/libmodplug/sndfile.h
@@ -447,6 +447,7 @@ typedef struct _MODCOMMAND
 
 class IMixPlugin
 {
+	virtual ~IMixPlugin() {}
 public:
 	virtual int AddRef() = 0;
 	virtual int Release() = 0;
-- 
cgit v1.2.1