From 9c8ea35617a9a4ae8a9c3859e1a8befc940dd9f7 Mon Sep 17 00:00:00 2001 From: Sébastien Moutte Date: Sun, 11 Feb 2007 12:57:47 +0000 Subject: gst/avi/gstavimux.c: Comment a #if 0 in caps template definition as VS6 seems to do not support it. Original commit message from CVS: * gst/avi/gstavimux.c: Comment a #if 0 in caps template definition as VS6 seems to do not support it. * gst/rtsp/gstrtspsrc.c:(gst_rtspsrc_loop_udp): Use gst_guint64_to_gdouble for conversion. * gst/rtsp/rtspconnection.c:(rtsp_connection_send): Move variables declaration before the first instruction. * gst/rtsp/rtspdefs.c:(rtsp_strresult): Don't use hstrerror for error log on G_OS_WIN32 build as it's not supported. And don't include netdb.h for G_OS_WIN32 * gst/rtsp/sdpmessage.c:(sdp_parse_line): This initialization SDPMedia nmedia = {.media = NULL }; is not supported by VS6 then use an other way to initialize SDPMedia structure. * gst/udp/gstdynudpsink.h: * gst/udp/gstdynudpnetutils.h: Do not include for G_OS_WIN32 * gst/udp/gstudpsrc.c: Define socklen_t as int for G_OS_WIN32 * win/common/config.h.in: Undef HAVE_NETINET_IN_H * win32/vs6/gst_plugins_good.dsw: * win32/vs6/libgstrtp.dsp: * win32/vs6/libgstrtsp.dsp: * win32/vs6/libgstautogen.dsp: * win32/vs6/libgstaudiofx.dsp: * win32/vs6/libgstudp.dsp: Add and update project files. * win32/common/gstudp-enumtypes.c: * win32/common/gstudp-enumtypes.h: Add a copy of udp enumtypes to win32/common as in core and base. --- gst/avi/gstavimux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gst/avi') diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index fddb6290..84dc51ae 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -171,10 +171,10 @@ static GstStaticPadTemplate audio_sink_factory = "mpegversion = (int) 1, " "layer = (int) [ 1, 3 ], " "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]; " -#if 0 +/*#if 0 VC6 doesn't support #if here ... "audio/x-vorbis, " "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]; " -#endif +#endif*/ "audio/x-ac3, " "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]") ); -- cgit