July 2004 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main mencoder.c, 1.247, 1.248 cfg-mencoder.h, 1.86, 1.87
by syncmail＠mplayerhq.hu 30 Aug '04

30 Aug '04

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv28706 Modified Files: mencoder.c cfg-mencoder.h Log Message: more lame options Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- mencoder.c 30 Apr 2004 20:05:54 -0000 1.247 +++ mencoder.c 19 May 2004 04:33:00 -0000 1.248 @@ -224,6 +224,9 @@ float lame_param_scale=-1; // unset int lame_param_lowpassfreq = 0; //auto int lame_param_highpassfreq = 0; //auto +int lame_param_free_format = 0; //disabled +int lame_param_br_min = 0; //not specified +int lame_param_br_max = 0; //not specified #if HAVE_MP3LAME >= 392 int lame_param_fast=0; // unset @@ -1007,10 +1010,13 @@ lame_set_num_channels(lame,mux_a->wf->nChannels); lame_set_out_samplerate(lame,mux_a->wf->nSamplesPerSec); lame_set_quality(lame,lame_param_algqual); // 0 = best q +if(lame_param_free_format) lame_set_free_format(lame,1); if(lame_param_vbr){ // VBR: lame_set_VBR(lame,lame_param_vbr); // vbr mode lame_set_VBR_q(lame,lame_param_quality); // 0 = best vbr q 5=~128k if(lame_param_br>0) lame_set_VBR_mean_bitrate_kbps(lame,lame_param_br); + if(lame_param_br_min>0) lame_set_VBR_min_bitrate_kbps(lame,lame_param_br_min); + if(lame_param_br_max>0) lame_set_VBR_max_bitrate_kbps(lame,lame_param_br_max); } else { // CBR: if(lame_param_br>0) lame_set_brate(lame,lame_param_br); } Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- cfg-mencoder.h 3 May 2004 13:19:04 -0000 1.86 +++ cfg-mencoder.h 19 May 2004 04:33:00 -0000 1.87 @@ -35,6 +35,10 @@ {"vol", &lame_param_scale, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10, NULL}, {"lowpassfreq",&lame_param_lowpassfreq, CONF_TYPE_INT, CONF_RANGE, -1, 48000,0}, {"highpassfreq",&lame_param_highpassfreq, CONF_TYPE_INT, CONF_RANGE, -1, 48000,0}, + {"nofree", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, + {"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, #if HAVE_MP3LAME >= 392 {"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL},

2 2

CVS: main cfg-mencoder.h,1.82,1.83
by syncmail＠mplayerhq.hu 30 Aug '04

30 Aug '04

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv27829 Modified Files: cfg-mencoder.h Log Message: oops, forgot this with the softskip patch Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- cfg-mencoder.h 24 Mar 2004 15:16:36 -0000 1.82 +++ cfg-mencoder.h 30 Apr 2004 10:07:52 -0000 1.83 @@ -207,6 +207,9 @@ {"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"encodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"noencodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + // info header strings {"info", info_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},

2 2

CVS: main/input input.h, 1.41, 1.42 input.c, 1.89, 1.90
by syncmail＠mplayerhq.hu 25 Aug '04

25 Aug '04

CVS change done by Alex Beregszaszi Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv30421/input Modified Files: input.h input.c Log Message: individual sub_select option not interferring with vobsub_lang Index: input.h =================================================================== RCS file: /cvsroot/mplayer/main/input/input.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- input.h 24 Dec 2003 22:00:50 -0000 1.41 +++ input.h 17 Jul 2004 12:47:12 -0000 1.42 @@ -53,6 +53,7 @@ #define MP_CMD_GET_SUB_VISIBILITY 49 #define MP_CMD_SUB_FORCED_ONLY 50 #define MP_CMD_VO_ONTOP 51 +#define MP_CMD_SUB_SELECT 52 #define MP_CMD_GUI_EVENTS 5000 #define MP_CMD_GUI_LOADFILE 5001 Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- input.c 26 Apr 2004 21:15:14 -0000 1.89 +++ input.c 17 Jul 2004 12:47:12 -0000 1.90 @@ -78,6 +78,7 @@ { MP_CMD_SUB_ALIGNMENT, "sub_alignment",0, { {MP_CMD_ARG_INT,{-1}}, {-1,{0}} } }, { MP_CMD_SUB_VISIBILITY, "sub_visibility", 0, { {-1,{0}} } }, { MP_CMD_VOBSUB_LANG, "vobsub_lang", 0, { {-1,{0}} } }, + { MP_CMD_SUB_SELECT, "sub_select", 0, { {-1,{0}} } }, { MP_CMD_GET_PERCENT_POS, "get_percent_pos", 0, { {-1,{0}} } }, { MP_CMD_GET_TIME_LENGTH, "get_time_length", 0, { {-1,{0}} } }, #ifdef USE_TV @@ -303,6 +304,7 @@ { { 't', 0 }, "sub_pos +1" }, { { 'a', 0 }, "sub_alignment" }, { { 'v', 0 }, "sub_visibility" }, + { { 'b', 0 }, "sub_select" }, { { 'j', 0 }, "vobsub_lang" }, { { 'F', 0 }, "forced_subs_only" }, #ifdef USE_EDL

3 3

CVS: main/libmpcodecs vd_ffmpeg.c,1.127,1.128
by syncmail＠mplayerhq.hu 11 Aug '04

11 Aug '04

CVS change done by Michael Niedermayer CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv3956 Modified Files: vd_ffmpeg.c Log Message: top/bottom mb row skipping Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- vd_ffmpeg.c 6 Jun 2004 13:48:30 -0000 1.127 +++ vd_ffmpeg.c 26 Jun 2004 02:23:51 -0000 1.128 @@ -101,6 +101,8 @@ static int lavc_param_idct_algo=0; static int lavc_param_debug=0; static int lavc_param_vismv=0; +static int lavc_param_skip_top=0; +static int lavc_param_skip_bottom=0; m_option_t lavc_decode_opts_conf[]={ {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, @@ -111,6 +113,8 @@ {"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, {"vismv", &lavc_param_vismv, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL}, + {"st", &lavc_param_skip_top, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, + {"sb", &lavc_param_skip_bottom, CONF_TYPE_INT, CONF_RANGE, 0, 999, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -241,6 +245,10 @@ #if LIBAVCODEC_BUILD >= 4698 avctx->debug_mv= lavc_param_vismv; #endif +#if LIBAVCODEC_BUILD >= 4717 + avctx->skip_top = lavc_param_skip_top; + avctx->skip_bottom= lavc_param_skip_bottom; +#endif mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",avctx->width,avctx->height); /* AVRn stores huffman table in AVI header */ /* Pegasus MJPEG stores it also in AVI header, but it uses the common

3 5

CVS: main/libmpcodecs ve_lavc.c,1.97,1.98
by syncmail＠mplayerhq.hu 09 Aug '04

09 Aug '04

CVS change done by Michael Niedermayer CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv1765 Modified Files: ve_lavc.c Log Message: mencoder psnr segfaults on readonly fs patch by (Fabio Russo <f.russo at sosinformatica dot com>) Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- ve_lavc.c 6 Jul 2004 12:29:32 -0000 1.97 +++ ve_lavc.c 20 Jul 2004 12:06:30 -0000 1.98 @@ -802,6 +802,8 @@ if(!fvstats) { perror("fopen"); lavc_param_psnr=0; // disable block + mp_msg(MSGT_MENCODER,MSGL_ERR,"Can't open %s for writing. Check your permissions.\n",filename); + return 0; /*exit(1);*/ } }

4 4

[Mplayer-cvslog] CVS: main/libmpdemux cddb.c, 1.14, 1.15 demux_avi.c, 1.58, 1.59 network.c, 1.89, 1.90 network.h, 1.18, 1.19 stream.c, 1.70, 1.71 stream.h, 1.66, 1.67
by syncmail＠mplayerhq.hu 04 Aug '04

04 Aug '04

CVS change done by Attila Kinali CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv2821/libmpdemux Modified Files: cddb.c demux_avi.c network.c network.h stream.c stream.h Log Message: enable seeking in http streams patch by Valentine Zaretsky <valik+mplayerdev(a)email.dp.ua> Index: cddb.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- cddb.c 17 May 2003 12:24:01 -0000 1.14 +++ cddb.c 17 Feb 2004 12:30:44 -0000 1.15 @@ -204,7 +204,7 @@ return -1; } - fd = http_send_request(url); + fd = http_send_request(url,0); if( fd<0 ) { printf("failed to send the http request\n"); return -1; Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_avi.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- demux_avi.c 22 Oct 2003 19:01:37 -0000 1.58 +++ demux_avi.c 17 Feb 2004 12:30:44 -0000 1.59 @@ -214,7 +214,7 @@ } pos = priv->idx_offset + (unsigned long)idx->dwChunkOffset; - if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->type!=STREAMTYPE_STREAM)){ + if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){ mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%X \n",pos); continue; } @@ -246,7 +246,7 @@ if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0; } else { demux->filepos=stream_tell(demux->stream); - if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->type!=STREAMTYPE_STREAM)){ + if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & STREAM_SEEK)){ demux->stream->eof=1; return 0; } @@ -449,7 +449,7 @@ demuxer->priv=(void*)priv; //---- AVI header: - read_avi_header(demuxer,(demuxer->stream->type!=STREAMTYPE_STREAM)?index_mode:-2); + read_avi_header(demuxer,(demuxer->stream->flags & STREAM_SEEK)?index_mode:-2); if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){ mp_msg(MSGT_DEMUX,MSGL_WARN,"AVI: invalid audio stream ID: %d - ignoring (nosound)\n",demuxer->audio->id); Index: network.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- network.c 8 Dec 2003 13:25:32 -0000 1.89 +++ network.c 17 Feb 2004 12:30:44 -0000 1.90 @@ -428,7 +428,7 @@ } int -http_send_request( URL_t *url ) { +http_send_request( URL_t *url, off_t pos ) { HTTP_header_t *http_hdr; URL_t *server_url; char str[256]; @@ -455,6 +455,12 @@ } else http_set_field( http_hdr, "User-Agent: MPlayer/"VERSION); + + if(pos>0) { + // Extend http_send_request with possibility to do partial content retrieval + snprintf(str, 256, "Range: bytes=%d-", pos); + http_set_field(http_hdr, str); + } if (network_cookies_enabled) cookies_set( http_hdr, server_url->hostname, server_url->url ); @@ -572,6 +578,50 @@ return 0; } +int +http_seek( stream_t *stream, off_t pos ) { + HTTP_header_t *http_hdr = NULL; + int fd; + if( stream==NULL ) return 0; + + if( stream->fd>0 ) closesocket(stream->fd); // need to reconnect to seek in http-stream + fd = http_send_request( stream->streaming_ctrl->url, pos ); + if( fd<0 ) return 0; + + http_hdr = http_read_response( fd ); + + if( http_hdr==NULL ) return 0; + + switch( http_hdr->status_code ) { + case 200: + case 206: // OK + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", http_get_field(http_hdr, "Content-Type") ); + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length") ); + if( http_hdr->body_size>0 ) { + if( streaming_bufferize( stream->streaming_ctrl, http_hdr->body, http_hdr->body_size )<0 ) { + http_free( http_hdr ); + return -1; + } + } + break; + default: + mp_msg(MSGT_NETWORK,MSGL_ERR,"Server return %d: %s\n", http_hdr->status_code, http_hdr->reason_phrase ); + close( fd ); + fd = -1; + } + stream->fd = fd; + + if( http_hdr ) { + http_free( http_hdr ); + stream->streaming_ctrl->data = NULL; + } + + stream->pos=pos; + + return 1; +} + + // By using the protocol, the extension of the file or the content-type // we might be able to guess the streaming type. int @@ -581,6 +631,7 @@ int fd=-1; int redirect; int auth_retry=0; + int seekable=0; char *extension; char *content_type; char *next_url; @@ -683,7 +734,7 @@ // HTTP based protocol if( !strcasecmp(url->protocol, "http") || !strcasecmp(url->protocol, "http_proxy") ) { - fd = http_send_request( url ); + fd = http_send_request( url, 0 ); if( fd<0 ) { return -1; } @@ -701,7 +752,10 @@ } streaming_ctrl->data = (void*)http_hdr; - + + // Check if we can make partial content requests and thus seek in http-streams + seekable=(http_hdr!=NULL && http_hdr->status_code==200 && strncmp(http_get_field(http_hdr,"Accept-Ranges"),"bytes",5)==0); + // Check if the response is an ICY status_code reason_phrase if( !strcasecmp(http_hdr->protocol, "ICY") ) { switch( http_hdr->status_code ) { @@ -756,13 +810,13 @@ for( i=0 ; i<(sizeof(mime_type_table)/sizeof(mime_type_table[0])) ; i++ ) { if( !strcasecmp( content_type, mime_type_table[i].mime_type ) ) { *file_format = mime_type_table[i].demuxer_type; - return 0; + return seekable; // for streaming_start } } } // Not found in the mime type table, don't fail, // we should try raw HTTP - return 0; + return seekable; // for streaming_start // Redirect case 301: // Permanently case 302: // Temporarily @@ -857,7 +911,7 @@ fd = stream->fd; if( fd<0 ) { - fd = http_send_request( stream->streaming_ctrl->url ); + fd = http_send_request( stream->streaming_ctrl->url, 0 ); if( fd<0 ) return -1; http_hdr = http_read_response( fd ); if( http_hdr==NULL ) return -1; @@ -1121,6 +1175,11 @@ if( ret<0 ) { return -1; } + if( ret==1 ) { + stream->flags |= STREAM_SEEK; + stream->seek = http_seek; + } + ret = -1; // Get the bandwidth available Index: network.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- network.h 15 Aug 2003 19:13:23 -0000 1.18 +++ network.h 17 Feb 2004 12:30:45 -0000 1.19 @@ -53,7 +53,7 @@ int connect2Server(char *host, int port,int verb); -int http_send_request(URL_t *url); +int http_send_request(URL_t *url, off_t pos); HTTP_header_t *http_read_response(int fd); int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry); Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- stream.c 31 Aug 2003 18:51:05 -0000 1.70 +++ stream.c 17 Feb 2004 12:30:45 -0000 1.71 @@ -314,6 +314,14 @@ // A function call that return -1 can tell that the protocol // doesn't support seeking. #ifdef MPLAYER_NETWORK + if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one + if(!s->seek(s,newpos)) { + mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); + return 1; + } + break; + } + if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) { mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); Index: stream.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.h,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- stream.h 19 Jan 2004 19:16:10 -0000 1.66 +++ stream.h 17 Feb 2004 12:30:45 -0000 1.67 @@ -229,7 +229,7 @@ } inline static int stream_skip(stream_t *s,off_t len){ - if(len<0 || (len>2*STREAM_BUFFER_SIZE && s->type!=STREAMTYPE_STREAM)){ + if(len<0 || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK))) { // negative or big skip! return stream_seek(s,stream_tell(s)+len); }

4 3

CVS: main cfg-mplayer.h,1.223,1.224
by syncmail＠mplayerhq.hu 03 Aug '04

03 Aug '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv5773 Modified Files: cfg-mplayer.h Log Message: add var vo_rootwin and -rootwin switch for mac osx Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- cfg-mplayer.h 23 Jul 2004 13:00:16 -0000 1.223 +++ cfg-mplayer.h 29 Jul 2004 14:58:11 -0000 1.224 @@ -84,10 +84,11 @@ extern int stop_xscreensaver; extern char **vo_fstype_list; extern int vo_nomouse_input; +extern int WinID; #endif -#if defined(HAVE_X11) || defined(MACOSX) -extern int WinID; +#ifdef MACOSX +extern int vo_rootwin; #endif #ifdef HAVE_AA @@ -301,10 +302,11 @@ {"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0,0,-1,NULL}, + {"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL}, #endif -#if defined(HAVE_X11) || defined(MACOSX) - {"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL}, +#ifdef MACOSX + {"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif #ifdef HAVE_XINERAMA

5 6

CVS: main/libmpdemux demux_mkv.c, 1.14, 1.15 demux_ogg.c, 1.51, 1.52
by syncmail＠mplayerhq.hu 01 Aug '04

01 Aug '04

CVS change done by Jindrich Makovicka CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv31330/libmpdemux Modified Files: demux_mkv.c demux_ogg.c Log Message: ENCA support (http://trific.ath.cx/software/enca/) Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- demux_mkv.c 26 Apr 2004 09:22:17 -0000 1.14 +++ demux_mkv.c 8 May 2004 17:52:25 -0000 1.15 @@ -1832,7 +1832,7 @@ char *str; #ifdef USE_ICONV - subcp_open(); + subcp_open_noenca(); #endif stream_seek(s, s->start_pos); Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- demux_ogg.c 7 May 2004 08:31:39 -0000 1.51 +++ demux_ogg.c 8 May 2004 17:52:25 -0000 1.52 @@ -664,7 +664,7 @@ sh_video_t* sh_v; #ifdef USE_ICONV - subcp_open(); + subcp_open_noenca(); #endif clear_sub = -1;

6 5

CVS: main configure,1.887,1.888
by syncmail＠mplayerhq.hu 31 Jul '04

31 Jul '04

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv15604 Modified Files: configure Log Message: 10l to the author of this longstanding and obscure bug. Each language should be removed only once from the list. Thanks to Chris White for pointing out that there was a problem. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.887 retrieving revision 1.888 diff -u -r1.887 -r1.888 --- configure 17 Jul 2004 09:53:35 -0000 1.887 +++ configure 31 Jul 2004 22:17:23 -0000 1.888 @@ -2079,7 +2079,7 @@ break else echo -n "$i not found, " - _language=`echo $_language | sed "s/$i *//g"` + _language=`echo $_language | sed "s/$i *//"` fi done test -z "$_language" && _language=en @@ -2087,7 +2087,7 @@ if test -f "DOCS/man/$i/mplayer.1" ; then LANGUAGES=`echo $LANGUAGES | sed "s/$i *//2" | sed 's/ *$//'` else - LANGUAGES=`echo $LANGUAGES | sed "s/$i *//g" | sed 's/ *$//'` + LANGUAGES=`echo $LANGUAGES | sed "s/$i *//" | sed 's/ *$//'` fi done echores "using $_language (man pages: $LANGUAGES)"

1 0

CVS: main/Gui/mplayer/gtk opts.c,1.64,1.65
by syncmail＠mplayerhq.hu 31 Jul '04

31 Jul '04

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/Gui/mplayer/gtk In directory mail:/var2/tmp/cvs-serv27982 Modified Files: opts.c Log Message: 100l, fixes DXR3 compile problems caused by my last patch. Index: opts.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- opts.c 30 Jul 2004 15:58:36 -0000 1.64 +++ opts.c 31 Jul 2004 18:04:42 -0000 1.65 @@ -152,6 +152,10 @@ static char * vo_driver[3]; static int old_video_driver = 0; +#ifdef HAVE_DXR3 + void ShowDXR3Config( void ); + void HideDXR3Config( void ); +#endif void ShowAudioConfig(); void HideAudioConfig(); @@ -1684,7 +1688,7 @@ vbox1=AddVBox( AddDialogFrame( DXR3Config ),0 ); vbox2=AddVBox( vbox1,0 ); hbox1=AddHBox( vbox2,1 ); - AddLabel( MSGTR_PREFERENCES_OSS_Device,hbox1 ); + AddLabel( MSGTR_PREFERENCES_Audio_Device,hbox1 ); CBDevice=AddComboBox( hbox1 );

1 0