[gst-cvs] tpm gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst-libs/gst/dshow/ gst-plugins-bad/sys/dshowsrcwrapper/

[<tp...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     tpm
Date:           Sun Nov 04 2007  11:04:42 UTC

Log message:
	Patch by: Ole André Vadla Ravnås  <ole...@ta...>
	* gst-libs/gst/dshow/gstdshowfakesink.cpp:
	  (CDshowFakeSink.CDshowFakeSink):
	* gst-libs/gst/dshow/gstdshowfakesink.h: (CDshowFakeSink.m_hres):
	  Fix crasher in constructor due to the base class's constructor
	  not necessarily being NULL-safe (depends on the SDK version used
	  apparently; #492406).
	* sys/dshowsrcwrapper/gstdshowaudiosrc.c: (gst_dshowaudiosrc_prepare):
	* sys/dshowsrcwrapper/gstdshowvideosrc.c: (gst_dshowvideosrc_set_caps):
	  Fix a couple of MSVC compiler warnings (#492406).

Modified files:
    .               : ChangeLog
    gst-libs/gst/dshow: gstdshowfakesink.cpp gstdshowfakesink.h
    sys/dshowsrcwrapper: gstdshowaudiosrc.c gstdshowvideosrc.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2840&r2=1.2841
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst-libs/gst/dshow/gstdshowfakesink.cpp.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst-libs/gst/dshow/gstdshowfakesink.h.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/sys/dshowsrcwrapper/gstdshowaudiosrc.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/sys/dshowsrcwrapper/gstdshowvideosrc.c.diff?r1=1.2&r2=1.3

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.2840
retrieving revision 1.2841
diff -u -d -r1.2840 -r1.2841
--- ChangeLog	3 Nov 2007 19:50:09 -0000	1.2840
+++ ChangeLog	4 Nov 2007 11:04:27 -0000	1.2841
@@ -1,3 +1,18 @@
+2007-11-04  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Ole André Vadla Ravnås  <ole...@ta...>
+	* gst-libs/gst/dshow/gstdshowfakesink.cpp:
+	  (CDshowFakeSink.CDshowFakeSink):
+	* gst-libs/gst/dshow/gstdshowfakesink.h: (CDshowFakeSink.m_hres):
+	  Fix crasher in constructor due to the base class's constructor
+	  not necessarily being NULL-safe (depends on the SDK version used
+	  apparently; #492406).
+	* sys/dshowsrcwrapper/gstdshowaudiosrc.c: (gst_dshowaudiosrc_prepare):
+	* sys/dshowsrcwrapper/gstdshowvideosrc.c: (gst_dshowvideosrc_set_caps):
+	  Fix a couple of MSVC compiler warnings (#492406).
 2007-11-03  Sebastian Dröge  <sl...@ci...>
 
 	* gst/equalizer/demo.c: (main):
Index: gstdshowfakesink.cpp
RCS file: /cvs/gstreamer/gst-plugins-bad/gst-libs/gst/dshow/gstdshowfakesink.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstdshowfakesink.cpp	23 May 2007 22:44:12 -0000	1.1
+++ gstdshowfakesink.cpp	4 Nov 2007 11:04:28 -0000	1.2
@@ -22,7 +22,8 @@
 #include "gstdshowfakesink.h"
-CDshowFakeSink::CDshowFakeSink():CBaseRenderer(CLSID_DshowFakeSink, "DshowFakeSink", NULL, NULL)
+CDshowFakeSink::CDshowFakeSink()
+  : m_hres(S_OK), CBaseRenderer(CLSID_DshowFakeSink, "DshowFakeSink", NULL, &m_hres)
 {
   m_callback = NULL;
 }
Index: gstdshowfakesink.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst-libs/gst/dshow/gstdshowfakesink.h,v
--- gstdshowfakesink.h	23 May 2007 22:44:12 -0000	1.1
+++ gstdshowfakesink.h	4 Nov 2007 11:04:28 -0000	1.2
@@ -43,6 +43,7 @@
   STDMETHOD (gst_set_sample_size) (unsigned int size);
 protected:
+  HRESULT m_hres;
   CMediaType m_MediaType;
   push_buffer_func m_callback;
   byte *m_data;
Index: gstdshowaudiosrc.c
RCS file: /cvs/gstreamer/gst-plugins-bad/sys/dshowsrcwrapper/gstdshowaudiosrc.c,v
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gstdshowaudiosrc.c	24 Sep 2007 10:53:36 -0000	1.2
+++ gstdshowaudiosrc.c	4 Nov 2007 11:04:28 -0000	1.3
@@ -641,7 +641,7 @@
         IGstDshowInterface_gst_set_media_type (srcinterface,
             pin_mediatype->mediatype);
         IGstDshowInterface_gst_set_buffer_callback (srcinterface,
-            gst_dshowaudiosrc_push_buffer, (byte *) src);
+            (byte *) gst_dshowaudiosrc_push_buffer, (byte *) src);
         if (srcinterface) {
           IGstDshowInterface_Release (srcinterface);
Index: gstdshowvideosrc.c
RCS file: /cvs/gstreamer/gst-plugins-bad/sys/dshowsrcwrapper/gstdshowvideosrc.c,v
--- gstdshowvideosrc.c	24 Sep 2007 10:53:37 -0000	1.2
+++ gstdshowvideosrc.c	4 Nov 2007 11:04:28 -0000	1.3
@@ -688,7 +688,7 @@
-            gst_dshowvideosrc_push_buffer, (byte *) src);
+            (byte *) gst_dshowvideosrc_push_buffer, (byte *) src);