From: <tp...@ke...> - 2007-01-08 12:45:24
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Mon Jan 08 2007 12:45:22 UTC Log message: Patch by: Vincent Torri <vtorri at univ-evry fr> * ext/jpeg/gstjpegdec.c: * ext/jpeg/gstjpegenc.c: * ext/jpeg/smokecodec.c: These libjpeg callbacks should return a 'boolean' (unsigned char apparently) and not a 'gboolean' (which maps to gint). Fixes warnings when compiling with MingW (#393427). * gst/rtsp/rtspconnection.c: (rtsp_connection_read): Use ioctlsocket on win32. * gst/udp/gstudpsrc.c: (gst_udpsrc_create): Some printf format fixes for win32. Modified files: . : ChangeLog ext/jpeg : gstjpegdec.c gstjpegenc.c smokecodec.c gst/rtsp : rtspconnection.c gst/udp : gstudpsrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2680&r2=1.2681 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/jpeg/gstjpegdec.c.diff?r1=1.55&r2=1.56 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/jpeg/gstjpegenc.c.diff?r1=1.40&r2=1.41 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/jpeg/smokecodec.c.diff?r1=1.5&r2=1.6 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/rtsp/rtspconnection.c.diff?r1=1.23&r2=1.24 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/udp/gstudpsrc.c.diff?r1=1.66&r2=1.67 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2680 retrieving revision 1.2681 diff -u -d -r1.2680 -r1.2681 --- ChangeLog 7 Jan 2007 10:44:11 -0000 1.2680 +++ ChangeLog 8 Jan 2007 12:45:10 -0000 1.2681 @@ -1,3 +1,20 @@ +2007-01-08 Tim-Philipp Müller <tim at centricular dot net> + + Patch by: Vincent Torri <vtorri at univ-evry fr> + * ext/jpeg/gstjpegdec.c: + * ext/jpeg/gstjpegenc.c: + * ext/jpeg/smokecodec.c: + These libjpeg callbacks should return a 'boolean' (unsigned char + apparently) and not a 'gboolean' (which maps to gint). Fixes + warnings when compiling with MingW (#393427). + * gst/rtsp/rtspconnection.c: (rtsp_connection_read): + Use ioctlsocket on win32. + * gst/udp/gstudpsrc.c: (gst_udpsrc_create): + Some printf format fixes for win32. 2007-01-07 Sébastien Moutte <seb...@mo...> * gst/cutter/gstcutter.c: (gst_cutter_chain): Index: gstjpegdec.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/jpeg/gstjpegdec.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- gstjpegdec.c 1 Nov 2006 13:59:49 -0000 1.55 +++ gstjpegdec.c 8 Jan 2007 12:45:10 -0000 1.56 @@ -192,7 +192,7 @@ GST_DEBUG_CATEGORY_INIT (jpeg_dec_debug, "jpegdec", 0, "JPEG decoder"); } -static gboolean +static boolean gst_jpeg_dec_fill_input_buffer (j_decompress_ptr cinfo) { /* @@ -230,7 +230,7 @@ } gst_jpeg_dec_resync_to_restart (j_decompress_ptr cinfo, gint desired) GST_DEBUG ("resync_to_start"); Index: gstjpegenc.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/jpeg/gstjpegenc.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- gstjpegenc.c 30 Oct 2006 09:24:53 -0000 1.40 +++ gstjpegenc.c 8 Jan 2007 12:45:10 -0000 1.41 @@ -186,7 +186,7 @@ GST_DEBUG ("gst_jpegenc_chain: init_destination"); gst_jpegenc_flush_destination (j_compress_ptr cinfo) GST_DEBUG ("gst_jpegenc_chain: flush_destination: buffer too small !!!"); Index: smokecodec.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/jpeg/smokecodec.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- smokecodec.c 16 Oct 2006 18:22:46 -0000 1.5 +++ smokecodec.c 8 Jan 2007 12:45:10 -0000 1.6 @@ -72,7 +72,7 @@ -static int smokecodec_flush_destination (j_compress_ptr cinfo) return 1; @@ -88,7 +88,7 @@ smokecodec_fill_input_buffer (j_decompress_ptr cinfo) @@ -99,7 +99,7 @@ smokecodec_resync_to_restart (j_decompress_ptr cinfo, int desired) Index: rtspconnection.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/rtsp/rtspconnection.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- rtspconnection.c 15 Nov 2006 17:44:01 -0000 1.23 +++ rtspconnection.c 8 Jan 2007 12:45:10 -0000 1.24 @@ -50,7 +50,6 @@ #include <stdlib.h> #include <string.h> #include <fcntl.h> -#include <sys/ioctl.h> /* we include this here to get the G_OS_* defines */ #include <glib.h> @@ -58,6 +57,7 @@ #ifdef G_OS_WIN32 #include <winsock2.h> #else +#include <sys/ioctl.h> #include <netdb.h> #include <sys/socket.h> #include <netinet/in.h> @@ -90,8 +90,10 @@ } G_STMT_END +#define IOCTL_SOCKET ioctlsocket #define CLOSE_SOCKET(sock) closesocket(sock); +#define IOCTL_SOCKET ioctl #define CLOSE_SOCKET(sock) close(sock); #endif @@ -489,7 +491,12 @@ fd_set readfds; guint toread; gint retval; +#ifndef G_OS_WIN32 gint avail; +#else + gulong avail; +#endif g_return_val_if_fail (conn != NULL, RTSP_EINVAL); g_return_val_if_fail (data != NULL, RTSP_EINVAL); @@ -501,7 +508,7 @@ /* if the call fails, just go in the select.. it should not fail. Else if * there is enough data to read, skip the select call al together.*/ - if (ioctl (conn->fd, FIONREAD, &avail) < 0) + if (IOCTL_SOCKET (conn->fd, FIONREAD, &avail) < 0) avail = 0; else if (avail >= toread) goto do_read; Index: gstudpsrc.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstudpsrc.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- gstudpsrc.c 6 Dec 2006 14:33:54 -0000 1.66 +++ gstudpsrc.c 8 Jan 2007 12:45:10 -0000 1.67 @@ -420,7 +420,7 @@ if ((ret = IOCTL_SOCKET (udpsrc->sock, FIONREAD, &readsize)) < 0) goto ioctl_failed; - GST_LOG_OBJECT (udpsrc, "ioctl says %d bytes available", readsize); + GST_LOG_OBJECT (udpsrc, "ioctl says %d bytes available", (int) readsize); pktdata = g_malloc (readsize); pktsize = readsize; @@ -447,7 +447,7 @@ gst_buffer_set_caps (GST_BUFFER_CAST (outbuf), udpsrc->caps); - GST_LOG_OBJECT (udpsrc, "read %d bytes", readsize); + GST_LOG_OBJECT (udpsrc, "read %d bytes", (int) readsize); *buf = GST_BUFFER_CAST (outbuf); |