January 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libvo Makefile,1.27,1.28 video_out.c,1.31,1.32
by Alex Beregszaszi 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv11282 Modified Files: Makefile video_out.c Log Message: added vo_xvidix Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libvo/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile 11 Jan 2002 17:20:43 -0000 1.27 +++ Makefile 12 Jan 2002 23:30:20 -0000 1.28 @@ -7,7 +7,7 @@ OBJS=$(SRCS:.c=.o) ifeq ($(VIDIX),yes) -SRCS += vosub_vidix.c +SRCS += vosub_vidix.c vo_xvidix.c endif CFLAGS = $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DVB_INC) -DMPG12PLAY #-Wall Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- video_out.c 11 Jan 2002 16:06:45 -0000 1.31 +++ video_out.c 12 Jan 2002 23:30:20 -0000 1.32 @@ -78,6 +78,10 @@ extern vo_functions_t video_out_vesa; #endif extern vo_functions_t video_out_directfb; +#ifdef CONFIG_VIDIX +extern vo_functions_t video_out_xvidix; +#endif + vo_functions_t* video_out_drivers[] = { #ifdef HAVE_XMGA @@ -142,5 +146,8 @@ #ifdef HAVE_DIRECTFB &video_out_directfb, #endif +#ifdef CONFIG_VIDIX + &video_out_xvidix, +#endif NULL };

1 0

CVS: main/libvo vo_xvidix.c,NONE,1.1
by Alex Beregszaszi 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv10717 Added Files: vo_xvidix.c Log Message: added X11/VIDIX --- NEW FILE --- /* VIDIX accelerated overlay in a X window (C) Alex Beregszaszi WS window manager by Pontscho/Fresh! Based on vo_gl.c and vo_vesa.c */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include <math.h> #include <errno.h> #include "config.h" #include "video_out.h" #include "video_out_internal.h" #include <X11/Xlib.h> #include <X11/Xutil.h> //#include <X11/keysym.h> #include "x11_common.h" #include "aspect.h" #include "mp_msg.h" #include "vosub_vidix.h" LIBVO_EXTERN(xvidix) static vo_info_t vo_info = { "X11 (VIDIX)", "xvidix", "Alex Beregszaszi", "" }; /* X11 related variables */ static Window mywindow; static int X_already_started = 0; /* VIDIX related stuff */ static const char *vidix_name = NULL; /* Image parameters */ static uint32_t image_width; static uint32_t image_height; static uint32_t image_format; static uint32_t image_depth; /* Window parameters */ static uint32_t window_x, window_y; static uint32_t window_width, window_height; /* used by XGetGeometry & XTranslateCoordinates */ static Window mRoot; static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth, drwDepth, drwcX, drwcY, dwidth, dheight, mFullscreen; static void resize(int x, int y) { XGetGeometry(mDisplay, mywindow, &mRoot, &drwX, &drwY, &drwWidth, &drwHeight, &drwBorderWidth, &drwDepth); drwX = drwY = 0; XTranslateCoordinates(mDisplay, mywindow, mRoot, 0, 0, &drwcX, &drwcY, &mRoot); mp_msg(MSGT_VO, MSGL_DBG2, "[xvidix] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n", drwcX, drwcY, drwX, drwY, drwWidth, drwHeight); if ((window_x != drwcX) || (window_y != drwcY) || (window_width != drwWidth) || (window_height != drwHeight)) { /* FIXME: implement runtime resize/move if possible, this way is very ugly! */ vidix_term(); vidix_preinit(vidix_name, &video_out_xvidix); if (vidix_init(image_width, image_height, window_x, window_y, window_width, window_height, image_format, image_depth, image_width, image_height) != 0) { mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s: %s\n", vidix_name, strerror(errno)); vidix_term(); uninit(); exit(1); /* !!! */ } } window_x = drwcX; window_y = drwcY; window_width = drwWidth; window_height = drwHeight; mp_msg(MSGT_VO, MSGL_INFO, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n", window_x, window_y, window_width, window_height); return; } /* connect to server, create and map window, * allocate colors and (shared) memory */ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) { unsigned int fg, bg; XVisualInfo vinfo; XEvent xev; XSizeHints hint; XSetWindowAttributes xswa; unsigned long xswamask; XWindowAttributes attribs; int window_depth; if (!vo_subdevice) mp_msg(MSGT_VO, MSGL_INFO, "No vidix driver name provided, probing available drivers!\n"); else vidix_name = strdup(vo_subdevice); if (!title) title = strdup("X11/VIDIX"); image_height = height; image_width = width; image_format = format; if (IMGFMT_IS_RGB(format)) { image_depth = IMGFMT_RGB_DEPTH(format); } else if (IMGFMT_IS_BGR(format)) { image_depth = IMGFMT_BGR_DEPTH(format); } else switch(format) { case IMGFMT_IYUV: case IMGFMT_I420: case IMGFMT_YV12: image_depth = 12; break; case IMGFMT_YUY2: image_depth = 16; break; default: mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s", vo_format_name(format)); return(-1); } if (X_already_started) return(-1); if (!vo_init()) return(-1); aspect_save_orig(width,height); aspect_save_prescale(d_width,d_height); aspect_save_screenres(vo_screenwidth,vo_screenheight); X_already_started++; aspect(&d_width, &d_height, A_NOZOOM); #ifdef X11_FULLSCREEN if (flags & 0x01) /* fullscreen */ aspect(&d_width, &d_height, A_ZOOM); #endif hint.x = 0; hint.y = 0; hint.width = d_width; hint.height = d_height; hint.flags = PPosition | PSize; /* Get some colors */ bg = WhitePixel(mDisplay, mScreen); fg = BlackPixel(mDisplay, mScreen); /* Make the window */ XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); /* from vo_x11 */ window_depth = attribs.depth; if ((window_depth != 15) && (window_depth != 16) && (window_depth != 24) && (window_depth != 32)) window_depth = 24; XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor, &vinfo); xswa.background_pixel = 0; xswa.border_pixel = 1; xswa.colormap = XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen), vinfo.visual, AllocNone); xswamask = CWBackPixel | CWBorderPixel | CWColormap; // xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask | CWCursor | CWOverrideRedirect | CWSaveUnder | CWX | CWY | CWWidth | CWHeight; if (WinID >= 0) { mywindow = WinID ? ((Window)WinID) : RootWindow(mDisplay, mScreen); XUnmapWindow(mDisplay, mywindow); XChangeWindowAttributes(mDisplay, mywindow, xswamask, &xswa); } else mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay, mScreen), hint.x, hint.y, hint.width, hint.height, xswa.border_pixel, vinfo.depth, CopyFromParent, vinfo.visual, xswamask, &xswa); vo_x11_classhint(mDisplay, mywindow, "xvidix"); vo_hidecursor(mDisplay, mywindow); if (flags & 0x01) /* fullscreen */ vo_x11_decoration(mDisplay, mywindow, 0); XSelectInput(mDisplay, mywindow, StructureNotifyMask); /* Tell other applications about this window */ XSetStandardProperties(mDisplay, mywindow, title, title, None, NULL, 0, &hint); /* Map window. */ XMapWindow(mDisplay, mywindow); #ifdef HAVE_XINERAMA vo_x11_xinerama_move(mDisplay, mywindow); #endif /* Wait for map. */ do { XNextEvent(mDisplay, &xev); } while ((xev.type != MapNotify) || (xev.xmap.event != mywindow)); XSelectInput(mDisplay, mywindow, NoEventMask); XGetGeometry(mDisplay, mywindow, &mRoot, &drwX, &drwY, &drwWidth, &drwHeight, &drwBorderWidth, &drwDepth); drwX = drwY = 0; XTranslateCoordinates(mDisplay, mywindow, mRoot, 0, 0, &drwcX, &drwcY, &mRoot); window_x = drwcX; window_y = drwcY; window_width = drwWidth; window_height = drwHeight; mp_msg(MSGT_VO, MSGL_INFO, "[xvidix] image properties: %dx%d depth: %d\n", image_width, image_height, image_depth); mp_msg(MSGT_VO, MSGL_INFO, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n", window_x, window_y, window_width, window_height); if (vidix_init(image_width, image_height, window_x, window_y, window_width, window_height, format, image_depth, image_width, image_height) != 0) { mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s: %s\n", vidix_name, strerror(errno)); vidix_term(); return(-1); } XFlush(mDisplay); XSync(mDisplay, False); XSelectInput(mDisplay, mywindow, StructureNotifyMask | KeyPressMask ); saver_off(mDisplay); /* turning off screen saver */ return(0); } static const vo_info_t *get_info(void) { return(&vo_info); } static void Terminate_Display_Process(void) { getchar(); /* wait for enter to remove window */ vidix_term(); XDestroyWindow(mDisplay, mywindow); XCloseDisplay(mDisplay); X_already_started = 0; } static void check_events(void) { const int event = vo_x11_check_events(mDisplay); if (event & VO_EVENT_RESIZE) resize(vo_dwidth, vo_dheight); } /* draw_osd, flip_page, draw_slice, draw_frame should be overwritten with vidix functions (vosub_vidix.c) */ static void draw_osd(void) { mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_osd!\n"); return; } static void flip_page(void) { mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix flip_page!\n"); return; } static uint32_t draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) { mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_slice!\n"); return(0); } static uint32_t draw_frame(uint8_t *src[]) { mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_frame!\n"); return(0); } static uint32_t query_format(uint32_t format) { vidix_preinit(vidix_name, &video_out_xvidix); return(vidix_query_fourcc(format)); } static void uninit(void) { #ifdef HAVE_NEW_GUI if (vo_window == None) #endif { vidix_term(); saver_on(mDisplay); /* screen saver back on */ XDestroyWindow(mDisplay, mywindow); // XCloseDisplay(mDisplay); } }

1 0

CVS: main spudec.c,1.16,1.17
by Kim Minh Kaplan CVS 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv22140 Modified Files: spudec.c Log Message: Fix brightness of subtitles Index: spudec.c =================================================================== RCS file: /cvsroot/mplayer/main/spudec.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- spudec.c 10 Jan 2002 17:17:37 -0000 1.16 +++ spudec.c 12 Jan 2002 21:48:41 -0000 1.17 @@ -116,9 +116,9 @@ if (alpha[i] == 0) cmap[i] = 0; else { - cmap[i] = ((this->global_palette[this->palette[i]] >> 16) & 0xff) - alpha[i]; - if (cmap[i] < 0) - cmap[i] = 0; + cmap[i] = ((this->global_palette[this->palette[i]] >> 16) & 0xff); + if (cmap[i] + alpha[i] > 255) + cmap[i] = 256 - alpha[i]; } }

1 0

CVS: main/libmpdemux asf_streaming.c,1.18,1.19 network.c,1.23,1.24
by Bertrand Baudet 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv10907/libmpdemux Modified Files: asf_streaming.c network.c Log Message: Added proxy support. Index: asf_streaming.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- asf_streaming.c 10 Jan 2002 01:42:31 -0000 1.18 +++ asf_streaming.c 12 Jan 2002 21:08:12 -0000 1.19 @@ -61,7 +61,10 @@ if( fd!=-1 ) return fd; printf(" ===> ASF/TCP failed\n"); } - if( !strncasecmp( proto_s, "http", 4) || !strncasecmp( proto_s, "mms", 3) ) { + if( !strncasecmp( proto_s, "http", 4) || + !strncasecmp( proto_s, "mms", 3) || + !strncasecmp( proto_s, "proxy", 5) + ) { printf("Trying ASF/HTTP...\n"); fd = asf_http_streaming_start( stream ); if( fd!=-1 ) return fd; @@ -373,8 +376,9 @@ HTTP_header_t * asf_http_request(streaming_ctrl_t *streaming_ctrl) { HTTP_header_t *http_hdr; - URL_t *url = streaming_ctrl->url; - asf_http_streaming_ctrl_t *asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data; + URL_t *url = NULL; + URL_t *server_url = NULL; + asf_http_streaming_ctrl_t *asf_http_ctrl; char str[250]; char *ptr; int i,as = -1,vs = -1; @@ -382,12 +386,33 @@ int offset_hi=0, offset_lo=0, length=0; int asf_nb_stream=0; + // Sanity check + if( streaming_ctrl==NULL ) return NULL; + url = streaming_ctrl->url; + asf_http_ctrl = (asf_http_streaming_ctrl_t*)streaming_ctrl->data; + if( url==NULL || asf_http_ctrl==NULL ) return NULL; + // Common header for all requests. http_hdr = http_new_header(); - http_set_uri( http_hdr, url->file ); http_set_field( http_hdr, "Accept: */*" ); http_set_field( http_hdr, "User-Agent: NSPlayer/4.1.0.3856" ); - sprintf( str, "Host: %s:%d", url->hostname, url->port ); + + // Check if we are using a proxy + if( !strcasecmp( url->protocol, "proxy" ) ) { + server_url = url_new( (url->file)+1 ); + if( server_url==NULL ) { + printf("Invalid proxy URL\n"); + http_free( http_hdr ); + return NULL; + } + http_set_uri( http_hdr, server_url->url ); + sprintf( str, "Host: %s:%d", server_url->hostname, server_url->port ); + url_free( server_url ); + } else { + http_set_uri( http_hdr, url->file ); + sprintf( str, "Host: %s:%d", url->hostname, url->port ); + } + http_set_field( http_hdr, str ); http_set_field( http_hdr, "Pragma: xClientGUID={c77e7400-738a-11d2-9add-0020af0a3278}" ); sprintf(str, @@ -509,16 +534,6 @@ return asf_http_streaming_type( content_type, features ); } -URL_t * -asf_http_ASX_redirect( HTTP_header_t *http_hdr ) { - URL_t *url_redirect=NULL; - printf("=========>> ASX parser not yet implemented <<==========\n"); - - printf("ASX=[%s]\n", http_hdr->body ); - - return url_redirect; -} - int asf_http_streaming_start( stream_t *stream ) { HTTP_header_t *http_hdr=NULL; @@ -546,7 +561,11 @@ done = 1; if( fd>0 ) close( fd ); - if( url->port==0 ) url->port = 80; + if( !strcasecmp( url->protocol, "proxy" ) ) { + if( url->port==0 ) url->port = 8080; + } else { + if( url->port==0 ) url->port = 80; + } fd = connect2Server( url->hostname, url->port ); if( fd<0 ) return -1; @@ -566,7 +585,7 @@ http_hdr = http_new_header(); do { i = read( fd, buffer, BUFFER_SIZE ); -printf("read: %d\n", i ); +//printf("read: %d\n", i ); if( i<0 ) { perror("read"); http_free( http_hdr ); Index: network.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- network.c 10 Jan 2002 01:37:53 -0000 1.23 +++ network.c 12 Jan 2002 21:08:12 -0000 1.24 @@ -25,6 +25,8 @@ #include "asf.h" #include "rtp.h" +extern int verbose; + static struct { char *mime_type; int demuxer_type; @@ -174,11 +176,23 @@ int http_send_request( URL_t *url ) { HTTP_header_t *http_hdr; + URL_t *server_url; char str[80]; int fd; + int ret; + int proxy = 0; // Boolean + http_hdr = http_new_header(); - http_set_uri( http_hdr, url->file ); - snprintf(str, 80, "Host: %s", url->hostname ); + + if( !strcasecmp(url->protocol, "proxy") ) { + proxy = 1; + server_url = url_new( (url->file)+1 ); + http_set_uri( http_hdr, server_url->url ); + } else { + server_url = url; + http_set_uri( http_hdr, server_url->file ); + } + snprintf(str, 80, "Host: %s", server_url->hostname ); http_set_field( http_hdr, str); http_set_field( http_hdr, "User-Agent: MPlayer"); http_set_field( http_hdr, "Connection: closed"); @@ -186,12 +200,27 @@ return -1; } - if( url->port==0 ) url->port = 80; - fd = connect2Server( url->hostname, url->port ); + if( proxy ) { + if( url->port==0 ) url->port = 8080; // Default port for the proxy server + fd = connect2Server( url->hostname, url->port ); + url_free( server_url ); + } else { + if( server_url->port==0 ) server_url->port = 80; // Default port for the web server + fd = connect2Server( server_url->hostname, server_url->port ); + } if( fd<0 ) { return -1; } - write( fd, http_hdr->buffer, http_hdr->buffer_size ); + if( verbose ) { + printf("Request: [%s]\n", http_hdr->buffer ); + } + + ret = write( fd, http_hdr->buffer, http_hdr->buffer_size ); + if( ret!=http_hdr->buffer_size ) { + printf("Error while sending HTTP request: didn't sent all the request\n"); + return -1; + } + http_free( http_hdr ); return fd; @@ -296,8 +325,8 @@ } // HTTP based protocol - if( !strcasecmp(url->protocol, "http") ) { - if( url->port==0 ) url->port = 80; + if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "proxy") ) { + //if( url->port==0 ) url->port = 80; fd = http_send_request( url ); if( fd<0 ) { @@ -312,8 +341,10 @@ } *fd_out=fd; - http_debug_hdr( http_hdr ); - + if( verbose ) { + http_debug_hdr( http_hdr ); + } + streaming_ctrl->data = (void*)http_hdr; // Check if the response is an ICY status_code reason_phrase @@ -582,7 +613,7 @@ if( stream==NULL ) return -1; // For RTP streams, we usually don't know the stream type until we open it. - if( !strcmp( stream->streaming_ctrl->url->protocol, "rtp")) { + if( !strcasecmp( stream->streaming_ctrl->url->protocol, "rtp")) { if(stream->fd >= 0) { if(close(stream->fd) < 0) printf("streaming_start : Closing socket %d failed %s\n",stream->fd,strerror(errno));

1 0

CVS: main configure,1.366,1.367
by Alex Beregszaszi 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv10750 Modified Files: configure Log Message: some comments and messages Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- configure 12 Jan 2002 20:02:47 -0000 1.366 +++ configure 12 Jan 2002 21:07:17 -0000 1.367 @@ -1021,12 +1021,12 @@ esac echo Checking for awk ... $_gawk_ver if test "$_gawk_verc_fail" ; then -echo Awk was not found or has wrong version. -echo If you have no such one then it can be downloaded from: -echo ftp://ftp.gnu.org/gnu/gawk/ -echo Also check - maybe you already have gawk, mawk or nawk. -echo If test is succesful then make awk symlink. Example ln -sf gawk awk -echo Or rerun configure with --disable-vidix option. +echo "Awk was not found or has wrong version." +echo "If you have no such one, then the GNU implementation can be downloaded from:" +echo "ftp://ftp.gnu.org/gnu/gawk/" +echo "Also check - maybe you already have gawk, mawk or nawk." +echo "If test is successful then make awk symlink. Example: ln -sf gawk awk" +echo "Or rerun configure with --disable-vidix option." exit fi fi @@ -2885,7 +2885,7 @@ Note: for mencoder */ $_def_mp3lame -/* Define libmp1e */ +/* Define libmp1e for realtime mpeg encoding (for DXR3 and DVB cards) */ $_def_mp1e /* Define this to enable avg. byte/sec-based AVI sync method by default: @@ -2974,12 +2974,14 @@ $_def_libavcodec $_def_libavcodecso -/* use only decoders from libavcodec: */ +/* Use libavcodec's decoders */ #define CONFIG_DECODERS 1 +/* Use libavcodec's encoders */ #define CONFIG_ENCODERS 1 /* XAnim DLL support */ $_def_xanim +/* Default search path */ $_def_xanim_path /* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/ @@ -2989,7 +2991,7 @@ $_def_gui #define PREFIX "$_prefix" -/* Audio lib drivers */ +/* Audio output drivers */ $_def_ossaudio $_def_alsa5 $_def_alsa9 @@ -2997,7 +2999,6 @@ $_def_sgiaudio $_def_nas - /* Enable fast OSD/SUB renderer (looks ugly, but uses less CPU power) */ #undef FAST_OSD #undef FAST_OSD_TABLE @@ -3061,6 +3062,7 @@ /* enable OggVorbis support */ $_def_vorbis +/* enable streaming */ $_def_streaming /* enables / disables vidix usage */ @@ -3254,6 +3256,8 @@ cat <<EOF You've disabled VIDIX. Although it would be better to PORT it instead. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Also currently the only driver in VIDIX is for ATI Radeon and Rage128. +Matrox G200/400 needs to be ported. EOF fi

1 0

CVS: main/libmpdemux url.c,1.11,1.12 url.h,1.5,1.6
by Bertrand Baudet 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv9423/libmpdemux Modified Files: url.c url.h Log Message: Added a debug function to print the struct's variables. Index: url.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/url.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- url.c 19 Dec 2001 13:03:22 -0000 1.11 +++ url.c 12 Jan 2002 21:02:00 -0000 1.12 @@ -192,3 +192,31 @@ } while (c != '\0'); } +#ifdef __URL_DEBUG +void +url_debug(URL_t *url) { + if( url==NULL ) { + printf("URL pointer NULL\n"); + return; + } + if( url->url!=NULL ) { + printf("url=%s\n", url->url ); + } + if( url->protocol!=NULL ) { + printf("protocol=%s\n", url->protocol ); + } + if( url->hostname!=NULL ) { + printf("hostname=%s\n", url->hostname ); + } + printf("port=%d\n", url->port ); + if( url->file!=NULL ) { + printf("file=%s\n", url->file ); + } + if( url->username!=NULL ) { + printf("username=%s\n", url->username ); + } + if( url->password!=NULL ) { + printf("password=%s\n", url->password ); + } +} +#endif //__URL_DEBUG Index: url.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/url.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- url.h 14 Dec 2001 23:48:47 -0000 1.5 +++ url.h 12 Jan 2002 21:02:00 -0000 1.6 @@ -7,6 +7,8 @@ #ifndef __URL_H #define __URL_H +//#define __URL_DEBUG + typedef struct { char *url; char *protocol; @@ -24,4 +26,8 @@ void url_unescape_string(char *outbuf, char *inbuf); void url_escape_string(char *outbuf, char *inbuf); -#endif +#ifndef __URL_DEBUG +void url_debug(URL_t* url); +#endif // __URL_DEBUG + +#endif // __URL_H

1 0

CVS: main/libdha pci_db2c.awk,1.2,1.3
by Atmosfear 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/libdha In directory mplayer:/var/tmp.root/cvs-serv5918 Modified Files: pci_db2c.awk Log Message: Fix typo and some updates. Index: pci_db2c.awk =================================================================== RCS file: /cvsroot/mplayer/main/libdha/pci_db2c.awk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pci_db2c.awk 12 Jan 2002 18:26:13 -0000 1.2 +++ pci_db2c.awk 12 Jan 2002 20:47:55 -0000 1.3 @@ -4,16 +4,16 @@ # # Usage: awk -f pci_db2c.awk pci.db # -# Tested with Gawk v 3.0.3 -# But there are reports that it works with Awk and Mawk -# (Nobody tested it with Nawk). +# Tested with Gawk v 3.0.x and Mawk 1.3.3 +# But it should work with standard Awk implementations (hopefully). +# (Nobody tested it with Nawk, but it should work, too). # BEGIN { if(ARGC != 2) { # check for arguments: - print "Usage gawk -f pci_dc2c.awk pci.db"; + print "Usage awk -f pci_db2c.awk pci.db (and make sure pci.db file exists first)"; exit(1); } in_file = ARGV[1];

1 0

CVS: main configure,1.365,1.366
by Atmosfear 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv25434 Modified Files: configure Log Message: Fix awk version check from --version to -W version (works with both mawk and gawk maybe guess also with original awk) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- configure 12 Jan 2002 18:58:41 -0000 1.365 +++ configure 12 Jan 2002 20:02:47 -0000 1.366 @@ -1009,7 +1009,7 @@ #checking for gawk if test "$_vidix" = yes ; then -_gawk_ver=`echo '' | awk --version 2>&1 | sed -n 's/^.*wk $[^A-Za-z ]*[0-9.]*$.*$/\1/p'` +_gawk_ver=`echo '' | awk -W version 2>&1 | sed -n 's/^.*wk $[^A-Za-z ]*[0-9.]*$.*$/\1/p'` case $_gawk_ver in '') _gawk_ver="v. ?.??, bad"

1 0

CVS: main/DOCS/Hungarian faq.html,1.42,1.43
by Winner of tha face compo 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mplayer:/var/tmp.root/cvs-serv13545/Hungarian Modified Files: faq.html Log Message: divx4linuxbuzi Index: faq.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/faq.html,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- faq.html 3 Jan 2002 21:12:35 -0000 1.42 +++ faq.html 12 Jan 2002 19:26:19 -0000 1.43 @@ -652,6 +652,12 @@ Sajnos ez a feature még nincs kész. </TD><TR><TD COLSPAN=3> </TD><TR> +<TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%> +A MEncoder induláskor csak "Segmentation fault"-ot ír! +</TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD> +Tedd fel a legújabb DivX4Linux-ot. +</TD><TR><TD COLSPAN=3> </TD><TR> + </TABLE> </BODY>

1 0

CVS: main/DOCS faq.html,1.59,1.60
by Winner of tha face compo 12 Jan '02

12 Jan '02

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv13545 Modified Files: faq.html Log Message: divx4linuxbuzi Index: faq.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/faq.html,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- faq.html 3 Jan 2002 21:12:30 -0000 1.59 +++ faq.html 12 Jan 2002 19:26:19 -0000 1.60 @@ -919,6 +919,13 @@ It's currently unimplemented. </TD><TR><TD COLSPAN=3> </TD><TR> +<TD></TD><TD VALIGN=top>Q:</TD><TD WIDTH=100%> +MEncoder segfaults on start ! +</TD><TR><TD></TD><TD VALIGN=top>A:</TD><TD> +Upgrade DivX4Linux. +</TD><TR><TD COLSPAN=3> </TD><TR> + + </TABLE> </BODY>

1 0