From: <seb...@ke...> - 2006-06-01 20:27:09
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: sebastien Date: Tue May 30 2006 21:07:50 UTC Log message: * 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 Modified files: . : ChangeLog gst/avi : gstavidemux.c win32 : MANIFEST win32/vs6 : libgstavi.dsp libgstid3demux.dsp libgstmatroska.dsp Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2369&r2=1.2370 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/avi/gstavidemux.c.diff?r1=1.181&r2=1.182 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/win32/MANIFEST.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/win32/vs6/libgstavi.dsp.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/win32/vs6/libgstid3demux.dsp.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/win32/vs6/libgstmatroska.dsp.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2369 retrieving revision 1.2370 diff -u -d -r1.2369 -r1.2370 --- ChangeLog 30 May 2006 14:35:17 -0000 1.2369 +++ ChangeLog 30 May 2006 21:07:37 -0000 1.2370 @@ -1,3 +1,16 @@ +2006-05-30 Sebastien Moutte <seb...@mo...> + + * 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 > Index: gstavidemux.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/avi/gstavidemux.c,v retrieving revision 1.181 retrieving revision 1.182 diff -u -d -r1.181 -r1.182 --- gstavidemux.c 12 May 2006 18:10:36 -0000 1.181 +++ gstavidemux.c 30 May 2006 21:07:38 -0000 1.182 @@ -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); -static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad); + static const GstFormat *gst_avi_demux_get_src_formats (GstPad * pad); -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 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 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) Index: MANIFEST RCS file: /cvs/gstreamer/gst-plugins-good/win32/MANIFEST,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MANIFEST 3 May 2006 14:28:57 -0000 1.1 +++ MANIFEST 30 May 2006 21:07:38 -0000 1.2 @@ -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 Index: libgstavi.dsp RCS file: /cvs/gstreamer/gst-plugins-good/win32/vs6/libgstavi.dsp,v retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libgstavi.dsp 9 Apr 2006 17:31:37 -0000 1.2 +++ libgstavi.dsp 30 May 2006 21:07:38 -0000 1.3 @@ -111,6 +111,10 @@ 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" Index: libgstid3demux.dsp RCS file: /cvs/gstreamer/gst-plugins-good/win32/vs6/libgstid3demux.dsp,v --- libgstid3demux.dsp 30 Mar 2006 23:46:42 -0000 1.1 +++ libgstid3demux.dsp 30 May 2006 21:07:38 -0000 1.2 @@ -54,7 +54,7 @@ # 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 @@ # 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" TargetPath=.\Debug\libgstid3demux.dll Index: libgstmatroska.dsp RCS file: /cvs/gstreamer/gst-plugins-good/win32/vs6/libgstmatroska.dsp,v --- libgstmatroska.dsp 30 Mar 2006 23:46:42 -0000 1.1 +++ libgstmatroska.dsp 30 May 2006 21:07:38 -0000 1.2 @@ -116,6 +116,10 @@ # Begin Source File +SOURCE="..\..\gst\matroska\matroska-ids.c" SOURCE="..\..\gst\matroska\matroska-mux.c" |