October 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main configure,1.796,1.797
by Diego Biurrun CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv19855 Modified Files: configure Log Message: in configure --help output: add --enable-altivec, remove --disable-big-endian (--enable-big-endian already present), cosmetics Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.796 retrieving revision 1.797 diff -u -r1.796 -r1.797 --- configure 25 Oct 2003 20:33:51 -0000 1.796 +++ configure 27 Oct 2003 01:06:35 -0000 1.797 @@ -178,9 +178,10 @@ --enable-fribidi Enable using the FriBiDi libs [disabled] --disable-macosx Disable Mac OS X specific features [autodetect] --disable-inet6 Disable IPv6 support [autodetect] - --disable-gethostbyname2 - gethostbyname() is not provided by the C library [autodetect] + --disable-gethostbyname2 gethostbyname() function is not provided by the C + library [autodetect] --disable-ftp Disable ftp support [enabled] + Codecs: --enable-gif enable gif support [autodetect] --enable-png enable png input/output support [autodetect] @@ -202,7 +203,7 @@ --enable-matroska build with Matroska support [autodetect] --enable-faad build with FAAD2 (MP4/AAC) support [autodetect] --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] - --disable-mad disable libmad (mpeg audio) support [autodetect] + --disable-mad disable libmad (MPEG audio) support [autodetect] --enable-xmms build with XMMS inputplugin support [disabled] --enable-external-faad build with external libfaad [disabled] --enable-flac build with FLAC support [autodetect] @@ -217,7 +218,7 @@ --enable-sdl build with SDL render support [autodetect] --enable-aa build with AAlib render support [autodetect] --enable-ggi build with GGI render support [autodetect] - --enable-directx build with Directx support [autodetect] + --enable-directx build with DirectX support [autodetect] --enable-dxr2 build with DXR2 render support [autodetect] --enable-dxr3 build with DXR3/H+ render support [autodetect] --enable-dvb build with support for output via DVB-Card [autodetect] @@ -268,14 +269,14 @@ default and you want to point to the GNU version) Advanced options: - --enable-mmx build with mmx support [autodetect] - --enable-mmx2 build with mmx2 support (PIII, Athlon) [autodetect] - --enable-3dnow build with 3dnow! support [autodetect] - --enable-3dnowex build with 3dnow-dsp! support (K7) [autodetect] - --enable-sse build with sse support [autodetect] - --enable-sse2 build with sse2 support [autodetect] - --disable-fastmemcpy disable 3dnow/sse/mmx optimized memcpy() [enable] - --disable-big-endian Force byte order to little endian [autodetect] + --enable-mmx build with MMX support [autodetect] + --enable-mmx2 build with MMX2 support (PIII, Athlon) [autodetect] + --enable-3dnow build with 3DNow! support [autodetect] + --enable-3dnowex build with extended 3DNow! support [autodetect] + --enable-sse build with SSE support [autodetect] + --enable-sse2 build with SSE2 support [autodetect] + --enable-altivec build with Altivec support (PowerPC) [autodetect] + --disable-fastmemcpy disable 3DNow!/SSE/MMX optimized memcpy() [enable] --enable-big-endian Force byte order to big endian [autodetect] --enable-debug[=1-3] compile debugging information into mplayer [disable] --enable-profile compile profiling information into mplayer [disable] @@ -305,16 +306,16 @@ (e.g. /opt/lib/libxvidcore.a) --with-sdl-config=PATH path to sdl*-config (e.g. /opt/bin/sdl-config) --with-freetype-config=PATH path to freetype-config - (e.g. /opt/bin/freetype-config) + (e.g. /opt/bin/freetype-config) --with-gtk-config=PATH path to gtk*-config (e.g. /opt/bin/gtk-config) --with-glib-config=PATH path to glib*-config (e.g. /opt/bin/glib-config) --with-livelibdir=DIR path to LIVE.COM Streaming Media libraries - --with-xmmsplugindir=DIR path to xmms plugins + --with-xmmsplugindir=DIR path to XMMS plugins --with-xmmslibdir=DIR path to libxmms.so.1 --with-cdparanoiaincdir=DIR cdparanoia headers in DIR --with-cdparanoialibdir=DIR cdparanoia libraries (libcdda_*) in DIR --with-fribidi-config=PATH path to fribidi-config - (e.g. /opt/bin/fribidi-config) + (e.g. /opt/bin/fribidi-config) EOF exit 0

1 0

CVS: main/libmpcodecs vf_hue.c,NONE,1.1 Makefile,1.110,1.111 vf.c,1.93,1.94
by Michael Niedermayer CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv24470 Modified Files: Makefile vf.c Added Files: vf_hue.c Log Message: vf_hue --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <string.h> #include <inttypes.h> #include <math.h> #include "../config.h" #include "../mp_msg.h" #include "../cpudetect.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "../libvo/video_out.h" #include "m_option.h" #include "m_struct.h" static struct vf_priv_s { uint8_t *buf[2]; float hue; float saturation; } vf_priv_dflt = { {NULL, NULL}, 0.0, 1.0, }; static void process_C(uint8_t *udst, uint8_t *vdst, uint8_t *usrc, uint8_t *vsrc, int dststride, int srcstride, int w, int h, float hue, float sat) { int i; const int s= rint(sin(hue) * (1<<16) * sat); const int c= rint(cos(hue) * (1<<16) * sat); while (h--) { for (i = 0; i<w; i++) { const int u= usrc[i] - 128; const int v= vsrc[i] - 128; int new_u= (c*u - s*v + (1<<15) + (128<<16))>>16; int new_v= (s*u + c*v + (1<<15) + (128<<16))>>16; if(new_u & 768) new_u= (-new_u)>>31; if(new_v & 768) new_v= (-new_v)>>31; udst[i]= new_u; vdst[i]= new_v; } usrc += srcstride; vsrc += srcstride; udst += dststride; vdst += dststride; } } static void (*process)(uint8_t *udst, uint8_t *vdst, uint8_t *usrc, uint8_t *vsrc, int dststride, int srcstride, int w, int h, float hue, float sat); /* FIXME: add packed yuv version of process */ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi) { mp_image_t *dmpi; dmpi=vf_get_image(vf->next, mpi->imgfmt, MP_IMGTYPE_EXPORT, 0, mpi->w, mpi->h); dmpi->planes[0] = mpi->planes[0]; dmpi->stride[0] = mpi->stride[0]; dmpi->stride[1] = mpi->stride[1]; dmpi->stride[2] = mpi->stride[2]; if (!vf->priv->buf[0]){ vf->priv->buf[0] = malloc(mpi->stride[1]*mpi->h >> mpi->chroma_y_shift); vf->priv->buf[1] = malloc(mpi->stride[2]*mpi->h >> mpi->chroma_y_shift); } if (vf->priv->hue == 0){ dmpi->planes[1] = mpi->planes[1]; dmpi->planes[2] = mpi->planes[2]; }else { dmpi->planes[1] = vf->priv->buf[0]; dmpi->planes[2] = vf->priv->buf[1]; process(dmpi->planes[1], dmpi->planes[2], mpi->planes[1], mpi->planes[2], dmpi->stride[1],mpi->stride[1], mpi->w>> mpi->chroma_x_shift, mpi->h>> mpi->chroma_y_shift, vf->priv->hue, vf->priv->saturation); } return vf_next_put_image(vf,dmpi); } static int control(struct vf_instance_s* vf, int request, void* data) { vf_equalizer_t *eq; switch (request) { case VFCTRL_SET_EQUALIZER: eq = data; if (!strcmp(eq->item,"hue")) { vf->priv->hue = eq->value * M_PI / 100; return CONTROL_TRUE; } else if (!strcmp(eq->item,"saturation")) { vf->priv->saturation = eq->value/100.0 + 100; return CONTROL_TRUE; } break; case VFCTRL_GET_EQUALIZER: eq = data; if (!strcmp(eq->item,"hue")) { eq->value = rint(vf->priv->hue *100 / M_PI); return CONTROL_TRUE; }else if (!strcmp(eq->item,"saturation")) { eq->value = rint(vf->priv->saturation*100 - 100); return CONTROL_TRUE; } break; } return vf_next_control(vf, request, data); } static int query_format(struct vf_instance_s* vf, unsigned int fmt) { switch (fmt) { case IMGFMT_YVU9: case IMGFMT_IF09: case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_CLPL: case IMGFMT_Y800: case IMGFMT_Y8: case IMGFMT_NV12: case IMGFMT_444P: case IMGFMT_422P: case IMGFMT_411P: return vf_next_query_format(vf, fmt); } return 0; } static void uninit(struct vf_instance_s* vf) { if (vf->priv->buf[0]) free(vf->priv->buf[0]); if (vf->priv->buf[1]) free(vf->priv->buf[1]); free(vf->priv); } static int open(vf_instance_t *vf, char* args) { vf->control=control; vf->query_format=query_format; vf->put_image=put_image; vf->uninit=uninit; if(!vf->priv) { vf->priv = malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); } if (args) sscanf(args, "%f:%f", &vf->priv->hue, &vf->priv->saturation); vf->priv->hue *= M_PI / 180.0; process = process_C; #ifdef HAVE_MMXX if(gCpuCaps.hasMMX) process = process_MMX; #endif return 1; } #define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f) static m_option_t vf_opts_fields[] = { {"hue", ST_OFF(hue), CONF_TYPE_FLOAT, M_OPT_RANGE,-180.0 ,180.0, NULL}, {"saturation", ST_OFF(saturation), CONF_TYPE_FLOAT, M_OPT_RANGE,-10.0 ,10.0, NULL}, { NULL, NULL, 0, 0, 0, 0, NULL } }; static m_struct_t vf_opts = { "hue", sizeof(struct vf_priv_s), &vf_priv_dflt, vf_opts_fields }; vf_info_t vf_info_hue = { "hue changer", "hue", "Michael Niedermayer", "", open, &vf_opts }; Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- Makefile 22 Oct 2003 21:21:52 -0000 1.110 +++ Makefile 23 Oct 2003 18:36:02 -0000 1.111 @@ -14,7 +14,7 @@ VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c vd_theora.c VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT) -VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c +VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c ifeq ($(HAVE_FFPOSTPROCESS),yes) VFILTER_SRCS += vf_pp.c endif Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- vf.c 22 Oct 2003 21:21:52 -0000 1.93 +++ vf.c 23 Oct 2003 18:36:02 -0000 1.94 @@ -78,6 +78,7 @@ extern vf_info_t vf_info_framestep; extern vf_info_t vf_info_tile; extern vf_info_t vf_info_delogo; +extern vf_info_t vf_info_hue; // list of available filters: static vf_info_t* filter_list[]={ @@ -143,6 +144,7 @@ &vf_info_framestep, &vf_info_tile, &vf_info_delogo, + &vf_info_hue, NULL };

4 3

CVS: main cfg-common.h,1.118,1.119 cfg-mplayer.h,1.208,1.209
by Diego Biurrun CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv10811 Modified Files: cfg-common.h cfg-mplayer.h Log Message: _ ---> - in option names, approved by Alex. Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- cfg-common.h 25 Oct 2003 18:44:41 -0000 1.118 +++ cfg-common.h 27 Oct 2003 00:23:04 -0000 1.119 @@ -208,13 +208,13 @@ #ifdef USE_SUB {"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, #ifdef USE_FRIBIDI - {"fribidi_charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"flip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"noflip_hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL}, #else - {"fribidi_charset", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"flip_hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"noflip_hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"fribidi-charset", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"flip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"noflip-hebrew", "MPlayer wasn't compiled with FriBiDi support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif #ifdef USE_ICONV {"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL}, Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- cfg-mplayer.h 22 Oct 2003 13:21:23 -0000 1.208 +++ cfg-mplayer.h 27 Oct 2003 00:23:04 -0000 1.209 @@ -230,9 +230,9 @@ #endif #if defined(HAVE_FBDEV)||defined(HAVE_VESA) - {"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif #ifdef HAVE_FBDEV @@ -289,8 +289,9 @@ {"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL}, {"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL}, {"icelayer", "Use -fstype layer:<number> instead. -icelayer was obsoleted\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, - {"stop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"nostop_xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"stop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"nostop-xscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"keepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nokeepaspect", &vo_x11_keepaspect, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},

1 0

CVS: main/libmpcodecs vf_spp.c,1.2,1.3
by Michael Niedermayer CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv9669 Modified Files: vf_spp.c Log Message: 120l Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vf_spp.c 26 Oct 2003 23:35:46 -0000 1.2 +++ vf_spp.c 27 Oct 2003 00:14:33 -0000 1.3 @@ -128,7 +128,7 @@ int x, y, i; const int count= 1<<p->log2_count; const int log2_scale= 6-p->log2_count; - const int stride= p->temp_stride; + const int stride= p->temp_stride; //FIXME uint64_t block_align[32]; DCTELEM *block = (DCTELEM *)block_align; DCTELEM *block2= (DCTELEM *)(block_align+16); @@ -144,7 +144,7 @@ } for(y=0; y<8; y++){ memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride); - memcpy(p->src + (width+8+y)*stride, p->src + (width-y+7)*stride, stride); + memcpy(p->src + (height+8+y)*stride, p->src + (height-y+7)*stride, stride); } //FIXME (try edge emu)

1 0

CVS: main/libao2 ao_pcm.c,1.18,1.19
by Attila Kinali CVS 26 Oct '03

26 Oct '03

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv11517 Modified Files: ao_pcm.c Log Message: 64bit types fix by a unkown mandrake 64bit expert Index: ao_pcm.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_pcm.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ao_pcm.c 5 May 2003 23:43:30 -0000 1.18 +++ ao_pcm.c 26 Oct 2003 13:43:30 -0000 1.19 @@ -32,19 +32,19 @@ struct WaveHeader { - unsigned long riff; - unsigned long file_length; - unsigned long wave; - unsigned long fmt; - unsigned long fmt_length; - short fmt_tag; - short channels; - unsigned long sample_rate; - unsigned long bytes_per_second; - short block_align; - short bits; - unsigned long data; - unsigned long data_length; + uint32_t riff; + uint32_t file_length; + uint32_t wave; + uint32_t fmt; + uint32_t fmt_length; + uint16_t fmt_tag; + uint16_t channels; + uint32_t sample_rate; + uint32_t bytes_per_second; + uint16_t block_align; + uint16_t bits; + uint32_t data; + uint32_t data_length; }; /* init with default values */

1 0

CVS: main/libmpdemux demux_mkv.cpp,1.41,1.42
by Attila Kinali CVS 26 Oct '03

26 Oct '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv29702 Modified Files: demux_mkv.cpp Log Message: 10! someone please tell me how subs ever worked with mkv Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- demux_mkv.cpp 25 Oct 2003 12:42:24 -0000 1.41 +++ demux_mkv.cpp 26 Oct 2003 12:28:45 -0000 1.42 @@ -2357,10 +2357,10 @@ sizeof(mkv_sh_sub_t)); demuxer->sub->id = track->xid; - } else if (strcmp(track->codec_id, MKV_S_TEXTASCII) && + } else if (!(strcmp(track->codec_id, MKV_S_TEXTASCII) && strcmp(track->codec_id, MKV_S_TEXTUTF8) && strcmp(track->codec_id, MKV_S_TEXTSSA) && - strcmp(track->codec_id, "S_SSA")) + strcmp(track->codec_id, "S_SSA"))) mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not " "supported. Track will not be displayed.\n", track->codec_id); else {

1 0

CVS: main/TOOLS/mwallp compile.sh,1.5,1.6
by Attila Kinali CVS 26 Oct '03

26 Oct '03

Update of /cvsroot/mplayer/main/TOOLS/mwallp In directory mail:/var/tmp.root/cvs-serv12794 Modified Files: compile.sh Log Message: Make gabu happy Index: compile.sh =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/mwallp/compile.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- compile.sh 17 Feb 2003 11:45:10 -0000 1.5 +++ compile.sh 26 Oct 2003 11:23:37 -0000 1.6 @@ -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 \ + ../../postproc/libswscale.a ../../osdep/libosdep.a \ -I../../libmpcodecs -I../.. -I../../postproc \ -L/usr/X11/lib -L/usr/X11R6/lib -lX11 -lm -ljpeg -o mwallp

1 0

CVS: 0_90 ChangeLog,1.50,1.51 version.sh,1.14,1.15
by Diego Biurrun CVS 26 Oct '03

26 Oct '03

Update of /cvsroot/mplayer/0_90 In directory mail:/var/tmp.root/cvs-serv28974 Modified Files: ChangeLog version.sh Log Message: Fix for the remotely exploitable ASF vulnerability applied, ChangeLog updated, version bumped. Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/0_90/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ChangeLog 13 Aug 2003 13:14:08 -0000 1.50 +++ ChangeLog 26 Oct 2003 00:07:55 -0000 1.51 @@ -1,3 +1,8 @@ +mplayer (0.92) + + Security: + * remotely exploitable buffer overflow in the ASF streaming code fixed + mplayer (0.91) Index: version.sh =================================================================== RCS file: /cvsroot/mplayer/0_90/version.sh,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- version.sh 17 Aug 2003 20:07:44 -0000 1.14 +++ version.sh 26 Oct 2003 00:07:55 -0000 1.15 @@ -28,4 +28,4 @@ if test "$1" ; then extra="-$1" fi -echo "#define VERSION \"0.91-CVS-${last_cvs_update}${extra}\"" >version.h +echo "#define VERSION \"0.92-CVS-${last_cvs_update}${extra}\"" >version.h

1 0

CVS: 0_90/libmpdemux asf_streaming.c,1.36,1.37
by Diego Biurrun CVS 26 Oct '03

26 Oct '03

Update of /cvsroot/mplayer/0_90/libmpdemux In directory mail:/var/tmp.root/cvs-serv28974/libmpdemux Modified Files: asf_streaming.c Log Message: Fix for the remotely exploitable ASF vulnerability applied, ChangeLog updated, version bumped. Index: asf_streaming.c =================================================================== RCS file: /cvsroot/mplayer/0_90/libmpdemux/asf_streaming.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- asf_streaming.c 6 Jan 2003 16:42:20 -0000 1.36 +++ asf_streaming.c 26 Oct 2003 00:07:55 -0000 1.37 @@ -495,11 +495,11 @@ return NULL; } http_set_uri( http_hdr, server_url->url ); - sprintf( str, "Host: %s:%d", server_url->hostname, server_url->port ); + sprintf( str, "Host: %.220s:%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 ); + sprintf( str, "Host: %.220s:%d", url->hostname, url->port ); } http_set_field( http_hdr, str );

1 0

CVS: main configure,1.795,1.796
by Gabucino 25 Oct '03

25 Oct '03

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv17559 Modified Files: configure Log Message: finally removing pthread dependency!! (did because default NetBSD installs without pthread AFAIK) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.795 retrieving revision 1.796 diff -u -r1.795 -r1.796 --- configure 24 Oct 2003 07:44:38 -0000 1.795 +++ configure 25 Oct 2003 20:33:51 -0000 1.796 @@ -2253,14 +2253,17 @@ elif ( cc_check -pthread ) ; then _ld_pthread='-pthread' else - die "Static lib pthread not found (needed by Windows and networking stufff)." + echores "no static pthread found (v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, Win32 loader disabled)" + _ld_pthread='' ; _nas=no ; _tv_v4l=no ; _tv_v4l=no ; _macosx=no ; _win32=no fi else - die "Lib pthread not found (needed by Windows and networking stuff)." + echores "no (v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled)" + _ld_pthread='' ; _nas=no ; _tv_v4l=no ; _tv_v4l=no ; _macosx=no ; _win32=no fi fi -echores "yes (using $_ld_pthread)" - +if test "$_ld_pthread" != '' ; then + echores "yes (using $_ld_pthread)" +fi echocheck "sys/soundcard.h" cat > $TMPC << EOF

1 0