diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2005-05-15 16:30:32 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2005-05-15 16:30:32 +0000 |
| commit | 32df418b1e9634b8a4dff101614f9af43a25cce9 (patch) | |
| tree | 1a958ad0ec7d4da3ccd6d8951084ac39559d59bb | |
| parent | bb2e13a2f5474e5ffbffddfc6a1683a70531ffb8 (diff) | |
| download | gst-plugins-bad-32df418b1e9634b8a4dff101614f9af43a25cce9.tar.gz gst-plugins-bad-32df418b1e9634b8a4dff101614f9af43a25cce9.tar.bz2 gst-plugins-bad-32df418b1e9634b8a4dff101614f9af43a25cce9.zip | |
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).
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/directfb/directfbvideosink.c | 2 | ||||
| -rw-r--r-- | gst/modplug/libmodplug/sndfile.cpp | 6 | ||||
| -rw-r--r-- | gst/modplug/libmodplug/sndfile.h | 1 |
4 files changed, 15 insertions, 3 deletions
@@ -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; |