projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c121cab)
gst/avi/gstavidemux.c: add an explicit dll imported declaration for GST_CAT_EVENT...
authorSébastien Moutte <sebastien@moutte.net>
Tue, 30 May 2006 21:07:38 +0000 (21:07 +0000)
committerSébastien Moutte <sebastien@moutte.net>
Tue, 30 May 2006 21:07:38 +0000 (21:07 +0000)
Original commit message from CVS:
* gst/avi/gstavidemux.c:
add an explicit dll imported declaration for GST_CAT_EVENT+WIN32
* win32/MANIFEST:
sort file listing
* win32/vs6/libgstavi.dsp:
add gstavimux.c to the project
* win32/vs6/libgstid3demux.dsp:
add link to zlib library
* win32/vs6/libgstmatroska.dsp:
add matroska-ids.c to the project

ChangeLog patch | blob | history
common patch | blob | history
gst/avi/gstavidemux.c patch | blob | history
win32/MANIFEST patch | blob | history
win32/vs6/libgstavi.dsp patch | blob | history
win32/vs6/libgstid3demux.dsp patch | blob | history
win32/vs6/libgstmatroska.dsp patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 7e6f57a..a93893d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-05-30  Sebastien Moutte  <sebastien@moutte.net>
+
+       * gst/avi/gstavidemux.c:
+         add an explicit dll imported declaration for GST_CAT_EVENT+WIN32
+       * win32/MANIFEST:
+         sort file listing
+       * win32/vs6/libgstavi.dsp:
+         add gstavimux.c to the project
+       * win32/vs6/libgstid3demux.dsp:
+         add link to zlib library
+       * win32/vs6/libgstmatroska.dsp:
+         add matroska-ids.c to the project
+
 2006-05-30  Tim-Philipp Müller  <tim at centricular dot net>
 
        Patch by: Sebastian Dröge  <mail at slomosnail de >
diff --git a/common b/common
index 2f06c5c..b0fd90b 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 2f06c5cbc778e158d2429b09efc6740ff5281295
+Subproject commit b0fd90b1cfb51107e8a511a1f3983a06bdd18638
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 8136cd9..5d26eac 100644 (file)
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -56,43 +56,53 @@
 GST_DEBUG_CATEGORY_STATIC (avidemux_debug);
 #define GST_CAT_DEFAULT avidemux_debug
 
+#ifndef WIN32
 GST_DEBUG_CATEGORY_EXTERN (GST_CAT_EVENT);
+#else
+extern
+_declspec (dllimport)
+     GstDebugCategory *GST_CAT_EVENT;
+#endif
 
-static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
+     static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("video/x-msvideo")
     );
 
-static void gst_avi_demux_base_init (GstAviDemuxClass * klass);
-static void gst_avi_demux_class_init (GstAviDemuxClass * klass);
-static void gst_avi_demux_init (GstAviDemux * avi);
+     static void gst_avi_demux_base_init (GstAviDemuxClass * klass);
+     static void gst_avi_demux_class_init (GstAviDemuxClass * klass);
+     static void gst_avi_demux_init (GstAviDemux * avi);
 
-static void gst_avi_demux_reset (GstAviDemux * avi);
+     static void gst_avi_demux_reset (GstAviDemux * avi);
 
 #if 0
-static const GstEventMask *gst_avi_demux_get_event_mask (GstPad * pad);
+     static const GstEventMask *gst_avi_demux_get_event_mask (GstPad * pad);
 #endif
-static gboolean gst_avi_demux_handle_src_event (GstPad * pad, GstEvent * event);
+     static gboolean gst_avi_demux_handle_src_event (GstPad * pad,
+    GstEvent * event);
 
 #if 0
-static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad);
+     static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad);
 #endif
-static const GstQueryType *gst_avi_demux_get_src_query_types (GstPad * pad);
-static gboolean gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query);
-static gboolean gst_avi_demux_src_convert (GstPad * pad,
-    GstFormat src_format,
-    gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
-
-static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi, gboolean update);
-static void gst_avi_demux_loop (GstPad * pad);
-static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad);
-static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad,
+     static const GstQueryType *gst_avi_demux_get_src_query_types (GstPad *
+    pad);
+     static gboolean gst_avi_demux_handle_src_query (GstPad * pad,
+    GstQuery * query);
+     static gboolean gst_avi_demux_src_convert (GstPad * pad,
+    GstFormat src_format, gint64 src_value, GstFormat * dest_format,
+    gint64 * dest_value);
+
+     static gboolean gst_avi_demux_handle_seek (GstAviDemux * avi,
+    gboolean update);
+     static void gst_avi_demux_loop (GstPad * pad);
+     static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad);
+     static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad,
     gboolean active);
-static GstStateChangeReturn gst_avi_demux_change_state (GstElement * element,
-    GstStateChange transition);
+     static GstStateChangeReturn gst_avi_demux_change_state (GstElement *
+    element, GstStateChange transition);
 
-static GstElementClass *parent_class = NULL;
+     static GstElementClass *parent_class = NULL;
 
 GType
 gst_avi_demux_get_type (void)
diff --git a/win32/MANIFEST b/win32/MANIFEST
index 9683e67..2d3e49e 100644 (file)
--- a/win32/MANIFEST
+++ b/win32/MANIFEST
@@ -1,35 +1,35 @@
 win32/MANIFEST
 win32/common/config.h
 win32/common/config.h.in
+win32/vs6/gst_plugins_good.dsw
 win32/vs6/libgstalpha.dsp
-win32/vs6/libgstsmpte.dsp
-win32/vs6/libgsticydemux.dsp
-win32/vs6/libgstmedian.dsp
-win32/vs6/libgstvideobox.dsp
-win32/vs6/libgsteffectv.dsp
-win32/vs6/libgstmatroska.dsp
-win32/vs6/libgstmonoscope.dsp
-win32/vs6/libgstjpeg.dsp
-win32/vs6/libgstavi.dsp
-win32/vs6/libgstid3demux.dsp
+win32/vs6/libgstalaw.dsp
+win32/vs6/libgstalphacolor.dsp
 win32/vs6/libgstapetag.dsp
 win32/vs6/libgstauparse.dsp
+win32/vs6/libgstautodetect.dsp
+win32/vs6/libgstavi.dsp
+win32/vs6/libgstcutter.dsp
+win32/vs6/libgsteffectv.dsp
+win32/vs6/libgstflx.dsp
+win32/vs6/libgstgoom.dsp
+win32/vs6/libgsticydemux.dsp
+win32/vs6/libgstid3demux.dsp
+win32/vs6/libgstinterleave.dsp
+win32/vs6/libgstjpeg.dsp
 win32/vs6/libgstlevel.dsp
-win32/vs6/libgstalaw.dsp
+win32/vs6/libgstmatroska.dsp
+win32/vs6/libgstmedian.dsp
+win32/vs6/libgstmonoscope.dsp
 win32/vs6/libgstmulaw.dsp
-win32/vs6/libgstvideomixer.dsp
+win32/vs6/libgstmultipart.dsp
 win32/vs6/libgstrtp.dsp
-win32/vs6/libgstflx.dsp
+win32/vs6/libgstrtsp.dsp
+win32/vs6/libgstsmpte.dsp
 win32/vs6/libgstspeex.dsp
-win32/vs6/libgstwavparse.dsp
-win32/vs6/libgstmultipart.dsp
-win32/vs6/libgstgoom.dsp
+win32/vs6/libgstvideobalance.dsp
+win32/vs6/libgstvideobox.dsp
 win32/vs6/libgstvideoflip.dsp
-win32/vs6/libgstinterleave.dsp
+win32/vs6/libgstvideomixer.dsp
 win32/vs6/libgstwavenc.dsp
-win32/vs6/libgstvideobalance.dsp
-win32/vs6/libgstalphacolor.dsp
-win32/vs6/libgstautodetect.dsp
-win32/vs6/gst_plugins_good.dsw
-win32/vs6/libgstrtsp.dsp
-win32/vs6/libgstcutter.dsp
+win32/vs6/libgstwavparse.dsp
\ No newline at end of file
diff --git a/win32/vs6/libgstavi.dsp b/win32/vs6/libgstavi.dsp
index 36ac93b..b04b9cc 100644 (file)
--- a/win32/vs6/libgstavi.dsp
+++ b/win32/vs6/libgstavi.dsp
@@ -111,6 +111,10 @@ 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"
 
diff --git a/win32/vs6/libgstid3demux.dsp b/win32/vs6/libgstid3demux.dsp
index 01131a2..60672f1 100644 (file)
--- a/win32/vs6/libgstid3demux.dsp
+++ b/win32/vs6/libgstid3demux.dsp
@@ -54,7 +54,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 /machine:I386
-# ADD LINK32 libgsttag-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"
+# ADD LINK32 libgsttag-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib zlib.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release"
 # Begin Special Build Tool
 TargetPath=.\Release\libgstid3demux.dll
 SOURCE="$(InputPath)"
@@ -86,7 +86,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 libgsttag-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"
+# ADD LINK32 libgsttag-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib zlib.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\libgstid3demux.dll
 SOURCE="$(InputPath)"
diff --git a/win32/vs6/libgstmatroska.dsp b/win32/vs6/libgstmatroska.dsp
index 19c8c0a..f4a69fb 100644 (file)
--- a/win32/vs6/libgstmatroska.dsp
+++ b/win32/vs6/libgstmatroska.dsp
@@ -116,6 +116,10 @@ SOURCE="..\..\gst\matroska\matroska-demux.c"
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\gst\matroska\matroska-ids.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\..\gst\matroska\matroska-mux.c"
 # End Source File
 # Begin Source File
Domain: Multimedia / Media Common;