summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOle André Vadla Ravnås <ole.andre.ravnas@tandberg.com>2008-09-30 10:43:54 +0000
committerOle André Vadla Ravnås <ole.andre.ravnas@tandberg.com>2008-09-30 10:43:54 +0000
commit34a993ef50b0d24e58b36ec3dbc416544c8f64a2 (patch)
treed7c3b409f0ebd55eaaaa8da410dde7138b180f76
parentb8b5a842c1d95676683faa3ab6e646be19f96c37 (diff)
downloadgst-plugins-bad-34a993ef50b0d24e58b36ec3dbc416544c8f64a2.tar.gz
gst-plugins-bad-34a993ef50b0d24e58b36ec3dbc416544c8f64a2.tar.bz2
gst-plugins-bad-34a993ef50b0d24e58b36ec3dbc416544c8f64a2.zip
sys/dshowdecwrapper/gstdshowaudiodec.cpp
Original commit message from CVS: * sys/dshowdecwrapper/gstdshowaudiodec.cpp (AudioFakeSink.DoRenderSample): Fix a couple of signed/unsigned comparison warnings.
-rw-r--r--ChangeLog6
-rw-r--r--sys/dshowdecwrapper/gstdshowaudiodec.cpp4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c4a4062..912096f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-09-30 Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
+ * sys/dshowdecwrapper/gstdshowaudiodec.cpp
+ (AudioFakeSink.DoRenderSample):
+ Fix a couple of signed/unsigned comparison warnings.
+
+2008-09-30 Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>
+
* sys/dshowdecwrapper/gstdshowaudiodec.h (AudioFakeSink.AudioFakeSink):
* sys/dshowdecwrapper/gstdshowvideodec.h (VideoFakeSink.VideoFakeSink):
Use the _T() macro to support both Unicode and MBCS.
diff --git a/sys/dshowdecwrapper/gstdshowaudiodec.cpp b/sys/dshowdecwrapper/gstdshowaudiodec.cpp
index c2efec1e..11183572 100644
--- a/sys/dshowdecwrapper/gstdshowaudiodec.cpp
+++ b/sys/dshowdecwrapper/gstdshowaudiodec.cpp
@@ -217,14 +217,14 @@ HRESULT AudioFakeSink::DoRenderSample(IMediaSample *pMediaSample)
MIN ((unsigned int)size, GST_BUFFER_SIZE (out_buf)));
/* we have to remove some heading samples */
- if (clip_start > buf_start) {
+ if ((GstClockTime) clip_start > buf_start) {
start_offset = (guint)gst_util_uint64_scale_int (clip_start - buf_start,
mDec->rate, GST_SECOND) * mDec->depth / 8 * mDec->channels;
}
else
start_offset = 0;
/* we have to remove some trailing samples */
- if (clip_stop < buf_stop) {
+ if ((GstClockTime) clip_stop < buf_stop) {
stop_offset = (guint)gst_util_uint64_scale_int (buf_stop - clip_stop,
mDec->rate, GST_SECOND) * mDec->depth / 8 * mDec->channels;
}