June 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r18868 - in trunk: Gui/wm/ws.c TOOLS/Makefile TOOLS/mwallp/compile.sh TOOLS/subrip.c
by diego 30 Jun '06

30 Jun '06

Author: diego Date: Fri Jun 30 14:40:05 2006 New Revision: 18868 Modified: trunk/Gui/wm/ws.c trunk/TOOLS/Makefile trunk/TOOLS/mwallp/compile.sh trunk/TOOLS/subrip.c Log: postproc --> libswscale Modified: trunk/Gui/wm/ws.c ============================================================================== --- trunk/Gui/wm/ws.c (original) +++ trunk/Gui/wm/ws.c Fri Jun 30 14:40:05 2006 @@ -25,7 +25,7 @@ #include "wsxdnd.h" #include "../cpudetect.h" #include "../libswscale/swscale.h" -#include "../postproc/rgb2rgb.h" +#include "../libswscale/rgb2rgb.h" #include "../libmpcodecs/vf_scale.h" #include "../mp_msg.h" #include "../help_mp.h" Modified: trunk/TOOLS/Makefile ============================================================================== --- trunk/TOOLS/Makefile (original) +++ trunk/TOOLS/Makefile Fri Jun 30 14:40:05 2006 @@ -27,8 +27,8 @@ subrip: subrip.c $(CC) $(CFLAGS) -g -o $@ $< ../vobsub.o ../spudec.o ../mp_msg.o \ - ../unrarlib.o ../postproc/swscale.o ../postproc/rgb2rgb.o \ - ../postproc/yuv2rgb.o ../libmpcodecs/img_format.o -lm + ../unrarlib.o ../libswscale/swscale.o ../libswscale/rgb2rgb.o \ + ../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm vivodump: vivodump.c $(CC) $(CFLAGS) -o $@ $< ../mp_msg.o ../libmpdemux/libmpdemux.a Modified: trunk/TOOLS/mwallp/compile.sh ============================================================================== --- trunk/TOOLS/mwallp/compile.sh (original) +++ trunk/TOOLS/mwallp/compile.sh Fri Jun 30 14:40:05 2006 @@ -1,6 +1,6 @@ echo gcc -g mwallp.c jpeg.c ../../libvo/aclib.o ../../libmpcodecs/img_format.o \ ../../cpudetect.o ../../mp_msg-mencoder.o ../../libavcodec/libavcodec.a \ - ../../postproc/libswscale.a ../../osdep/libosdep.a \ - -I../../libmpcodecs -I../.. -I../../postproc \ + ../../libswscale/libswscale.a ../../osdep/libosdep.a \ + -I../../libmpcodecs -I../.. -I../../libswscale \ -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lm -ljpeg -o mwallp Modified: trunk/TOOLS/subrip.c ============================================================================== --- trunk/TOOLS/subrip.c (original) +++ trunk/TOOLS/subrip.c Fri Jun 30 14:40:05 2006 @@ -1,4 +1,4 @@ -/* -*- compile-command: "gcc -g -Wall -I.. -o subrip subrip.c ../vobsub.o ../spudec.o ../mp_msg.o ../unrarlib.o ../postproc/swscale.o ../postproc/rgb2rgb.o ../postproc/yuv2rgb.o ../libmpcodecs/img_format.o -lm" -*- */ +/* -*- compile-command: "gcc -g -Wall -I.. -o subrip subrip.c ../vobsub.o ../spudec.o ../mp_msg.o ../unrarlib.o ../libswscale/swscale.o ../libswscale/rgb2rgb.o ../libswscale/yuv2rgb.o ../libmpcodecs/img_format.o -lm" -*- */ /* * Use with CVS JOCR/GOCR. *

1 0

r18866 - in trunk: Gui/wm/ws.c Makefile libmpcodecs/vf_halfpack.c libmpcodecs/vf_palette.c libmpcodecs/vf_rgb2bgr.c libmpcodecs/vf_sab.c libmpcodecs/vf_scale.c libmpcodecs/vf_screenshot.c libmpcodecs/vf_smartblur.c libmpcodecs/vf_yuy2.c libswscale libvo/mga_common.c libvo/vo_aa.c libvo/vo_vesa.c libvo/vo_x11.c libvo/vo_yuv4mpeg.c postproc spudec.c
by lucabe 30 Jun '06

30 Jun '06

Author: lucabe Date: Fri Jun 30 14:00:31 2006 New Revision: 18866 Added: trunk/libswscale/ - copied from r18862, /trunk/postproc/ Removed: trunk/postproc/ Modified: trunk/Gui/wm/ws.c trunk/Makefile trunk/libmpcodecs/vf_halfpack.c trunk/libmpcodecs/vf_palette.c trunk/libmpcodecs/vf_rgb2bgr.c trunk/libmpcodecs/vf_sab.c trunk/libmpcodecs/vf_scale.c trunk/libmpcodecs/vf_screenshot.c trunk/libmpcodecs/vf_smartblur.c trunk/libmpcodecs/vf_yuy2.c trunk/libvo/mga_common.c trunk/libvo/vo_aa.c trunk/libvo/vo_vesa.c trunk/libvo/vo_x11.c trunk/libvo/vo_yuv4mpeg.c trunk/spudec.c Log: Move postproc ---> libswscale Modified: trunk/Gui/wm/ws.c ============================================================================== --- trunk/Gui/wm/ws.c (original) +++ trunk/Gui/wm/ws.c Fri Jun 30 14:00:31 2006 @@ -24,7 +24,7 @@ #include "ws.h" #include "wsxdnd.h" #include "../cpudetect.h" -#include "../postproc/swscale.h" +#include "../libswscale/swscale.h" #include "../postproc/rgb2rgb.h" #include "../libmpcodecs/vf_scale.h" #include "../mp_msg.h" Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Fri Jun 30 14:00:31 2006 @@ -110,7 +110,7 @@ $(W32_LIB) \ libaf/libaf.a \ libmpdemux/libmpdemux.a \ - postproc/libswscale.a \ + libswscale/libswscale.a \ osdep/libosdep.a \ $(DVDREAD_LIB) \ $(DVDNAV_LIB) \ @@ -163,9 +163,9 @@ libavcodec \ libpostproc \ libavformat \ + libswscale \ libao2 \ osdep \ - postproc \ input \ libvo \ libaf \ @@ -218,7 +218,7 @@ libmpcodecs/libmpcodecs.a \ libao2/libao2.a \ osdep/libosdep.a \ - postproc/libswscale.a \ + libswscale/libswscale.a \ input/libinput.a \ libvo/libvo.a \ libaf/libaf.a \ @@ -302,6 +302,9 @@ libavformat/libavformat.a: $(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a +libswscale/libswscale.a: + $(MAKE) -C libswscale + libmpeg2/libmpeg2.a: $(MAKE) -C libmpeg2 @@ -335,9 +338,6 @@ osdep/libosdep.a: $(MAKE) -C osdep -postproc/libswscale.a: - $(MAKE) -C postproc - input/libinput.a: $(MAKE) -C input @@ -583,7 +583,7 @@ libavutil/libavutil.a: $(wildcard libavutil/*.[ch]) libavcodec/libavcodec.a: $(wildcard libavcodec/*.[ch] libavcodec/*/*.[chS]) libavformat/libavformat.a: $(wildcard libavformat/*.[ch]) -postproc/libswscale.a: $(wildcard postproc/*.[ch]) +libswscale/libswscale.a: $(wildcard libswscale/*.[ch]) libmpeg2/libmpeg2.a: $(wildcard libmpeg2/*.[ch]) liba52/liba52.a: $(wildcard liba52/*.[ch]) Modified: trunk/libmpcodecs/vf_halfpack.c ============================================================================== --- trunk/libmpcodecs/vf_halfpack.c (original) +++ trunk/libmpcodecs/vf_halfpack.c Fri Jun 30 14:00:31 2006 @@ -13,7 +13,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" -#include "postproc/rgb2rgb.h" +#include "libswscale/rgb2rgb.h" struct vf_priv_s { int field; Modified: trunk/libmpcodecs/vf_palette.c ============================================================================== --- trunk/libmpcodecs/vf_palette.c (original) +++ trunk/libmpcodecs/vf_palette.c Fri Jun 30 14:00:31 2006 @@ -11,7 +11,7 @@ #include "mp_image.h" #include "vf.h" -#include "postproc/rgb2rgb.h" +#include "libswscale/rgb2rgb.h" //===========================================================================// Modified: trunk/libmpcodecs/vf_rgb2bgr.c ============================================================================== --- trunk/libmpcodecs/vf_rgb2bgr.c (original) +++ trunk/libmpcodecs/vf_rgb2bgr.c Fri Jun 30 14:00:31 2006 @@ -11,7 +11,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" -#include "postproc/rgb2rgb.h" +#include "libswscale/rgb2rgb.h" //===========================================================================// Modified: trunk/libmpcodecs/vf_sab.c ============================================================================== --- trunk/libmpcodecs/vf_sab.c (original) +++ trunk/libmpcodecs/vf_sab.c Fri Jun 30 14:00:31 2006 @@ -33,7 +33,7 @@ #include "mp_image.h" #include "vf.h" #include "libvo/fastmemcpy.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #include "vf_scale.h" Modified: trunk/libmpcodecs/vf_scale.c ============================================================================== --- trunk/libmpcodecs/vf_scale.c (original) +++ trunk/libmpcodecs/vf_scale.c Fri Jun 30 14:00:31 2006 @@ -12,7 +12,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #include "vf_scale.h" #include "m_option.h" Modified: trunk/libmpcodecs/vf_screenshot.c ============================================================================== --- trunk/libmpcodecs/vf_screenshot.c (original) +++ trunk/libmpcodecs/vf_screenshot.c Fri Jun 30 14:00:31 2006 @@ -22,7 +22,7 @@ #include "vf_scale.h" #include "libvo/fastmemcpy.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" struct vf_priv_s { int frameno; Modified: trunk/libmpcodecs/vf_smartblur.c ============================================================================== --- trunk/libmpcodecs/vf_smartblur.c (original) +++ trunk/libmpcodecs/vf_smartblur.c Fri Jun 30 14:00:31 2006 @@ -33,7 +33,7 @@ #include "mp_image.h" #include "vf.h" #include "libvo/fastmemcpy.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #include "vf_scale.h" //===========================================================================// Modified: trunk/libmpcodecs/vf_yuy2.c ============================================================================== --- trunk/libmpcodecs/vf_yuy2.c (original) +++ trunk/libmpcodecs/vf_yuy2.c Fri Jun 30 14:00:31 2006 @@ -12,7 +12,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" -#include "postproc/rgb2rgb.h" +#include "libswscale/rgb2rgb.h" #include "vf_scale.h" //===========================================================================// Modified: trunk/libvo/mga_common.c ============================================================================== --- trunk/libvo/mga_common.c (original) +++ trunk/libvo/mga_common.c Fri Jun 30 14:00:31 2006 @@ -1,7 +1,7 @@ #include "fastmemcpy.h" #include "cpudetect.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #include "libmpcodecs/vf_scale.h" #include "mp_msg.h" #include "help_mp.h" Modified: trunk/libvo/vo_aa.c ============================================================================== --- trunk/libvo/vo_aa.c (original) +++ trunk/libvo/vo_aa.c Fri Jun 30 14:00:31 2006 @@ -27,7 +27,7 @@ #include "video_out.h" #include "video_out_internal.h" #include "aspect.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #include "libmpcodecs/vf_scale.h" #include "font_load.h" #include "sub.h" Modified: trunk/libvo/vo_vesa.c ============================================================================== --- trunk/libvo/vo_vesa.c (original) +++ trunk/libvo/vo_vesa.c Fri Jun 30 14:00:31 2006 @@ -47,7 +47,7 @@ #endif #include "mp_msg.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #include "libmpcodecs/vf_scale.h" Modified: trunk/libvo/vo_x11.c ============================================================================== --- trunk/libvo/vo_x11.c (original) +++ trunk/libvo/vo_x11.c Fri Jun 30 14:00:31 2006 @@ -38,7 +38,7 @@ #include "fastmemcpy.h" #include "sub.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #include "libmpcodecs/vf_scale.h" #define MODE_RGB 0x1 #define MODE_BGR 0x2 Modified: trunk/libvo/vo_yuv4mpeg.c ============================================================================== --- trunk/libvo/vo_yuv4mpeg.c (original) +++ trunk/libvo/vo_yuv4mpeg.c Fri Jun 30 14:00:31 2006 @@ -39,7 +39,7 @@ #include "sub.h" #include "fastmemcpy.h" -#include "postproc/rgb2rgb.h" +#include "libswscale/swscale.h" #include "libmpcodecs/vf_scale.h" static vo_info_t info = Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c (original) +++ trunk/spudec.c Fri Jun 30 14:00:31 2006 @@ -23,7 +23,7 @@ #include <math.h> #include "libvo/video_out.h" #include "spudec.h" -#include "postproc/swscale.h" +#include "libswscale/swscale.h" #define MIN(a, b) ((a)<(b)?(a):(b))

1 0

r18865 - trunk/DOCS/tech/MAINTAINERS
by gpoirier 30 Jun '06

30 Jun '06

Author: gpoirier Date: Fri Jun 30 11:45:22 2006 New Revision: 18865 Modified: trunk/DOCS/tech/MAINTAINERS Log: Nicolas Le Gaillart has vanished Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS (original) +++ trunk/DOCS/tech/MAINTAINERS Fri Jun 30 11:45:22 2006 @@ -48,7 +48,7 @@ Documentation translations: * Czech: Jiri Heryan - * French: Nicolas Le Gaillart, Guillaume Poirier + * French: Guillaume Poirier * German: Sebastian Kr�mer * Hungarian: Gabor Mizda * Polish: Waclaw Schiller

1 0

r18864 - branches/1.0pre8_branch/ChangeLog
by diego 30 Jun '06

30 Jun '06

Author: diego Date: Fri Jun 30 11:00:40 2006 New Revision: 18864 Modified: branches/1.0pre8_branch/ChangeLog Log: Merge r18688 from trunk: forgotten release name. Modified: branches/1.0pre8_branch/ChangeLog ============================================================================== --- branches/1.0pre8_branch/ChangeLog (original) +++ branches/1.0pre8_branch/ChangeLog Fri Jun 30 11:00:40 2006 @@ -1,6 +1,6 @@ MPlayer (1.0) - pre8: June 11, 2006 + pre8: "NeuTeam strikes back" June 11, 2006 Security: * support for compilation with non-executable stack

1 0

r18862 - in trunk: input/input.c libaf/af_export.c libmenu/menu_console.c loader/ldt_keeper.c
by reynaldo 30 Jun '06

30 Jun '06

Author: reynaldo Date: Fri Jun 30 06:24:07 2006 New Revision: 18862 Modified: trunk/input/input.c trunk/libaf/af_export.c trunk/libmenu/menu_console.c trunk/loader/ldt_keeper.c Log: gets ride of a few more sizeof(char)s Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c (original) +++ trunk/input/input.c Fri Jun 30 06:24:07 2006 @@ -690,7 +690,7 @@ ptr2 = e + 1; l--; } - cmd->args[i].v.s = (char*)malloc((l+1)*sizeof(char)); + cmd->args[i].v.s = (char*)malloc(l+1); strncpy(cmd->args[i].v.s,start,l); cmd->args[i].v.s[l] = '\0'; if(term != ' ') ptr += l+2; @@ -746,7 +746,7 @@ // Allocate the buffer if it doesn't exist if(!mp_fd->buffer) { - mp_fd->buffer = (char*)malloc(MP_CMD_MAX_SIZE*sizeof(char)); + mp_fd->buffer = (char*)malloc(MP_CMD_MAX_SIZE); mp_fd->pos = 0; mp_fd->size = MP_CMD_MAX_SIZE; } @@ -802,7 +802,7 @@ // Not dropping : put the cmd in ret if( ! (mp_fd->flags & MP_FD_DROP)) { - (*ret) = (char*)malloc((l+1)*sizeof(char)); + (*ret) = (char*)malloc(l+1); strncpy((*ret),mp_fd->buffer,l); (*ret)[l] = '\0'; } else { // Remove the dropping flag Modified: trunk/libaf/af_export.c ============================================================================== --- trunk/libaf/af_export.c (original) +++ trunk/libaf/af_export.c Fri Jun 30 06:24:07 2006 @@ -135,7 +135,7 @@ if(s->filename) free(s->filename); - s->filename = calloc(i + 1, sizeof(char)); + s->filename = calloc(i + 1, 1); memcpy(s->filename, str, i); s->filename[i] = 0; Modified: trunk/libmenu/menu_console.c ============================================================================== --- trunk/libmenu/menu_console.c (original) +++ trunk/libmenu/menu_console.c Fri Jun 30 06:24:07 2006 @@ -467,7 +467,7 @@ mpriv->lines = calloc(mpriv->buf_lines,sizeof(char*)); mpriv->prompt = mpriv->mp_prompt; mpriv->cur_history = mpriv->history = calloc(1,sizeof(history_t)); - mpriv->cur_history->buffer = calloc(255,sizeof(char)); + mpriv->cur_history->buffer = calloc(255,1); mpriv->cur_history->size = 255; if(args) Modified: trunk/loader/ldt_keeper.c ============================================================================== --- trunk/loader/ldt_keeper.c (original) +++ trunk/loader/ldt_keeper.c Fri Jun 30 06:24:07 2006 @@ -272,7 +272,7 @@ Setup_FS_Segment(); - ldt_fs->prev_struct = (char*)malloc(sizeof(char) * 8); + ldt_fs->prev_struct = (char*)malloc(8); *(void**)array.base_addr = ldt_fs->prev_struct; return ldt_fs;

1 0

r18860 - trunk/libmpcodecs/vd_sgi.c
by reynaldo 30 Jun '06

30 Jun '06

Author: reynaldo Date: Fri Jun 30 05:18:12 2006 New Revision: 18860 Modified: trunk/libmpcodecs/vd_sgi.c Log: correct handling of sgi compressed images on amd64, patch by Paul-Francois Fontigny - pff AT filmik-be Modified: trunk/libmpcodecs/vd_sgi.c ============================================================================== --- trunk/libmpcodecs/vd_sgi.c (original) +++ trunk/libmpcodecs/vd_sgi.c Fri Jun 30 05:18:12 2006 @@ -155,7 +155,7 @@ decode_rle_sgi(SGIInfo *info, unsigned char *data, mp_image_t *mpi) { unsigned char *rle_data, *dest_row; - unsigned long *starttab; + uint32_t *starttab; int y, z, xsize, ysize, zsize, chan_offset; long start_offset; @@ -164,7 +164,7 @@ zsize = info->zsize; /* rle offset table is right after the header */ - starttab = (long*)(data + SGI_HEADER_LEN); + starttab = (uint32_t*)(data + SGI_HEADER_LEN); for (z = 0; z < zsize; z++) { @@ -177,7 +177,7 @@ dest_row = mpi->planes[0] + mpi->stride[0] * (ysize - 1 - y); /* set start of next run (offsets are from start of header) */ - start_offset = be2me_32(*(unsigned long*) &starttab[y + z * ysize]); + start_offset = be2me_32(*(uint32_t*) &starttab[y + z * ysize]); rle_data = &data[start_offset];

1 0

r18858 - trunk/libmpdemux/librtsp/rtsp.c
by ben 30 Jun '06

30 Jun '06

Author: ben Date: Thu Jun 29 23:53:35 2006 New Revision: 18858 Modified: trunk/libmpdemux/librtsp/rtsp.c Log: cosmetic patch to remove useless sizeof(char) statements Modified: trunk/libmpdemux/librtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp.c (original) +++ trunk/libmpdemux/librtsp/rtsp.c Thu Jun 29 23:53:35 2006 @@ -201,7 +201,7 @@ mp_msg(MSGT_OPEN, MSGL_FATAL, "librtsp: buffer overflow in rtsp_get\n"); exit(1); } - string=malloc(sizeof(char)*n); + string=malloc(n); memcpy(string,buffer,n-1); string[n-1]=0; @@ -221,7 +221,7 @@ static void rtsp_put(rtsp_t *s, const char *string) { int len=strlen(string); - char *buf=malloc(sizeof(char)*len+2); + char *buf=malloc(len+2); #ifdef LOG mp_msg(MSGT_OPEN, MSGL_INFO, "librtsp: >> '%s'", string); @@ -405,7 +405,7 @@ buf=strdup(what); } else { - buf=malloc(sizeof(char)*(strlen(s->host)+16)); + buf=malloc(strlen(s->host)+16); sprintf(buf,"rtsp://%s:%i", s->host, s->port); } rtsp_send_request(s,RTSP_METHOD_OPTIONS,buf); @@ -422,7 +422,7 @@ buf=strdup(what); } else { - buf=malloc(sizeof(char)*(strlen(s->host)+strlen(s->path)+16)); + buf=malloc(strlen(s->host)+strlen(s->path)+16); sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path); } rtsp_send_request(s,RTSP_METHOD_DESCRIBE,buf); @@ -461,7 +461,7 @@ buf=strdup(what); } else { - buf=malloc(sizeof(char)*(strlen(s->host)+strlen(s->path)+16)); + buf=malloc(strlen(s->host)+strlen(s->path)+16); sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path); } rtsp_send_request(s,RTSP_METHOD_SET_PARAMETER,buf); @@ -479,7 +479,7 @@ buf=strdup(what); } else { - buf=malloc(sizeof(char)*(strlen(s->host)+strlen(s->path)+16)); + buf=malloc(strlen(s->host)+strlen(s->path)+16); sprintf(buf,"rtsp://%s:%i/%s", s->host, s->port, s->path); } rtsp_send_request(s,RTSP_METHOD_PLAY,buf); @@ -548,7 +548,7 @@ } /* let's make the server happy */ rtsp_put(s, "RTSP/1.0 451 Parameter Not Understood"); - rest=malloc(sizeof(char)*17); + rest=malloc(17); sprintf(rest,"CSeq: %u", seq); rtsp_put(s, rest); rtsp_put(s, "");

2 1

r18859 - trunk/libmpdemux/librtsp/rtsp.c
by ben 29 Jun '06

29 Jun '06

Author: ben Date: Fri Jun 30 00:00:01 2006 New Revision: 18859 Modified: trunk/libmpdemux/librtsp/rtsp.c Log: coverity report #179 from xine: variable "rest" not freed or pointed-to in function "rtsp_put" (see http://xine.cvs.sourceforge.net/xine/xine-lib/src/input/librtsp/rtsp.c?r1=1…) Modified: trunk/libmpdemux/librtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp.c (original) +++ trunk/libmpdemux/librtsp/rtsp.c Fri Jun 30 00:00:01 2006 @@ -551,6 +551,7 @@ rest=malloc(17); sprintf(rest,"CSeq: %u", seq); rtsp_put(s, rest); + free(rest); rtsp_put(s, ""); i=read_stream(s->s, buffer, size); } else

1 0

r18857 - trunk/libmpdemux/librtsp/rtsp.c
by ben 29 Jun '06

29 Jun '06

Author: ben Date: Thu Jun 29 23:50:49 2006 New Revision: 18857 Modified: trunk/libmpdemux/librtsp/rtsp.c Log: increase buffer size, "CSeq: %u" has a worst case of 17 (fix 1.18 from xine, see http://xine.cvs.sourceforge.net/xine/xine-lib/src/input/librtsp/rtsp.c?r1=1…) Modified: trunk/libmpdemux/librtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp.c (original) +++ trunk/libmpdemux/librtsp/rtsp.c Thu Jun 29 23:50:49 2006 @@ -293,9 +293,9 @@ static void rtsp_schedule_standard(rtsp_t *s) { - char tmp[16]; + char tmp[17]; - snprintf(tmp, 16, "CSeq: %u", s->cseq); + snprintf(tmp, 17, "CSeq: %u", s->cseq); rtsp_schedule_field(s, tmp); if (s->session) { @@ -548,7 +548,7 @@ } /* let's make the server happy */ rtsp_put(s, "RTSP/1.0 451 Parameter Not Understood"); - rest=malloc(sizeof(char)*16); + rest=malloc(sizeof(char)*17); sprintf(rest,"CSeq: %u", seq); rtsp_put(s, rest); rtsp_put(s, "");

1 0

r18856 - trunk/libmpdemux/librtsp/rtsp.c
by ben 29 Jun '06

29 Jun '06

Author: ben Date: Thu Jun 29 23:46:51 2006 New Revision: 18856 Modified: trunk/libmpdemux/librtsp/rtsp.c Log: be more tolerant on server responses parameters case (fix 1.17 from xine, see http://xine.cvs.sourceforge.net/xine/xine-lib/src/input/librtsp/rtsp.c?r1=1…) Modified: trunk/libmpdemux/librtsp/rtsp.c ============================================================================== --- trunk/libmpdemux/librtsp/rtsp.c (original) +++ trunk/libmpdemux/librtsp/rtsp.c Thu Jun 29 23:46:51 2006 @@ -332,8 +332,8 @@ if (!answer) return 0; - if (!strncmp(answer,"CSeq:",5)) { - sscanf(answer,"CSeq: %u",&answer_seq); + if (!strncasecmp(answer,"CSeq:",5)) { + sscanf(answer,"%*s %u",&answer_seq); if (s->cseq != answer_seq) { #ifdef LOG mp_msg(MSGT_OPEN, MSGL_WARN, "librtsp: warning: CSeq mismatch. got %u, assumed %u", answer_seq, s->cseq); @@ -341,16 +341,16 @@ s->cseq=answer_seq; } } - if (!strncmp(answer,"Server:",7)) { + if (!strncasecmp(answer,"Server:",7)) { char *buf = malloc(strlen(answer)); - sscanf(answer,"Server: %s",buf); + sscanf(answer,"%*s %s",buf); if (s->server) free(s->server); s->server=strdup(buf); free(buf); } - if (!strncmp(answer,"Session:",8)) { + if (!strncasecmp(answer,"Session:",8)) { char *buf = calloc(1, strlen(answer)); - sscanf(answer,"Session: %s",buf); + sscanf(answer,"%*s %s",buf); if (s->session) { if (strcmp(buf, s->session)) { mp_msg(MSGT_OPEN, MSGL_WARN, "rtsp: warning: setting NEW session: %s\n", buf); @@ -536,8 +536,8 @@ rest=rtsp_get(s); if (!rest) return -1; - if (!strncmp(rest,"CSeq:",5)) - sscanf(rest,"CSeq: %u",&seq); + if (!strncasecmp(rest,"CSeq:",5)) + sscanf(rest,"%*s %u",&seq); } while (strlen(rest)!=0); free(rest); if (seq<0) {

1 0