November 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/input input.c,1.125,1.126
by syncmail＠mplayerhq.hu 24 Dec '06

24 Dec '06

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/input In directory mail:/var2/tmp/cvs-serv3818/input Modified Files: input.c Log Message: libvo input cleanup: remove the dependency on libinput, remove most of the crappy mappings (like O->o or ESC->q). Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- input.c 25 Oct 2005 21:23:45 -0000 1.125 +++ input.c 2 Nov 2005 21:50:54 -0000 1.126 @@ -240,10 +240,27 @@ { JOY_BTN8, "JOY_BTN8" }, { JOY_BTN9, "JOY_BTN9" }, - { KEY_XF86_PAUSE, "XF86_PAUSE" }, - { KEY_XF86_STOP, "XF86_STOP" }, - { KEY_XF86_PREV, "XF86_PREV" }, - { KEY_XF86_NEXT, "XF86_NEXT" }, + { KEY_POWER, "POWER" }, + { KEY_MENU, "MENU" }, + { KEY_PLAY, "PLAY" }, + { KEY_PAUSE, "PAUSE" }, + { KEY_PLAYPAUSE, "PLAYPAUSE" }, + { KEY_STOP, "STOP" }, + { KEY_FORWARD, "FORWARD" }, + { KEY_REWIND, "REWIND" }, + { KEY_NEXT, "NEXT" }, + { KEY_PREV, "PREV" }, + { KEY_VOLUME_UP, "VOLUME_UP" }, + { KEY_VOLUME_DOWN, "VOLUME_DOWN" }, + { KEY_MUTE, "MUTE" }, + + // These are kept for backward compatibility + { KEY_PAUSE, "XF86_PAUSE" }, + { KEY_STOP, "XF86_STOP" }, + { KEY_PREV, "XF86_PREV" }, + { KEY_NEXT, "XF86_NEXT" }, + + { KEY_CLOSE_WIN, "CLOSE_WIN" }, { 0, NULL } }; @@ -282,9 +299,11 @@ { { '}', 0 }, "speed_mult 2.0" }, { { KEY_BACKSPACE, 0 }, "speed_set 1.0" }, { { 'q', 0 }, "quit" }, + { { 'Q', 0 }, "quit" }, #ifndef HAVE_NEW_GUI { { KEY_ESC, 0 }, "quit" }, { { 'p', 0 }, "pause" }, + { { 'P', 0 }, "pause" }, #endif { { ' ', 0 }, "pause" }, { { '.', 0 }, "frame_step" }, @@ -298,6 +317,7 @@ { { KEY_INS, 0 }, "alt_src_step 1" }, { { KEY_DEL, 0 }, "alt_src_step -1" }, { { 'o', 0 }, "osd" }, + { { 'O', 0 }, "osd" }, { { 'z', 0 }, "sub_delay -0.1" }, { { 'x', 0 }, "sub_delay +0.1" }, { { 'g', 0 }, "sub_step -1" }, @@ -307,6 +327,7 @@ { { '0', 0 }, "volume 1" }, { { '*', 0 }, "volume 1" }, { { 'm', 0 }, "mute" }, + { { 'M', 0 }, "mute" }, { { '1', 0 }, "contrast -1" }, { { '2', 0 }, "contrast 1" }, { { '3', 0 }, "brightness -1" }, @@ -358,10 +379,21 @@ { { 'w', 0 }, "panscan -0.1" }, { { 'e', 0 }, "panscan +0.1" }, - { { KEY_XF86_PAUSE, 0 }, "pause" }, - { { KEY_XF86_STOP, 0 }, "quit" }, - { { KEY_XF86_PREV, 0 }, "seek -60" }, - { { KEY_XF86_NEXT, 0 }, "seek +60" }, + { { KEY_POWER, 0 }, "quit" }, + { { KEY_MENU, 0 }, "osd" }, + { { KEY_PLAY, 0 }, "pause" }, + { { KEY_PAUSE, 0 }, "pause" }, + { { KEY_PLAYPAUSE, 0 }, "pause" }, + { { KEY_STOP, 0 }, "quit" }, + { { KEY_FORWARD, 0 }, "seek 60" }, + { { KEY_REWIND, 0 }, "seek -60" }, + { { KEY_NEXT, 0 }, "pt_step 1" }, + { { KEY_PREV, 0 }, "pt_step -1" }, + { { KEY_VOLUME_UP, 0 }, "volume 1" }, + { { KEY_VOLUME_DOWN, 0 }, "volume -1" }, + { { KEY_MUTE, 0 }, "mute" }, + + { { KEY_CLOSE_WIN, 0 }, "quit" }, { { 0 }, NULL } };

3 3

CVS: main/libmpdemux muxer_mpeg.c,1.24,1.25
by syncmail＠mplayerhq.hu 30 Nov '05

30 Nov '05

CVS change done by Nico Sabbi CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv23688 Modified Files: muxer_mpeg.c Log Message: fixed wrong telecine trf pattern; fall back to mpeg2 when user specifies unknown format Index: muxer_mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- muxer_mpeg.c 29 Nov 2005 22:04:57 -0000 1.24 +++ muxer_mpeg.c 30 Nov 2005 21:45:32 -0000 1.25 @@ -1914,10 +1914,13 @@ if(! vpriv->vframes) //initial value of tff vpriv->trf = (pce_ptr[3] >> 6) & 0x2; + while(n < 0) n+=4; + vpriv->trf = (vpriv->trf + n) % 4; + //sets curent tff/rff bits tff = (vpriv->trf & 0x2) ? 0x80 : 0; rff = (vpriv->trf & 0x1) ? 0x2 : 0; - mp_msg(MSGT_MUXER, MSGL_DBG2, "\nTFF: %d, RFF: %d\n", tff >> 7, rff >> 1); + mp_msg(MSGT_MUXER, MSGL_DBG2, "\nTRF: %d, TFF: %d, RFF: %d, n: %d\n", vpriv->trf, tff >> 7, rff >> 1, n); pce_ptr[3] = (pce_ptr[3] & 0xfd) | tff | rff; pce_ptr[4] |= 0x80; //sets progressive frame @@ -1925,9 +1928,6 @@ mp_msg(MSGT_MUXER, MSGL_INFO, "\nENABLED SOFT TELECINING, FPS=%s, INITIAL PATTERN IS TFF:%d, RFF:%d\n", framerates[fps+3], tff >> 7, rff >> 1); - while(n < 0) n+=4; - vpriv->trf = (vpriv->trf + n) % 4; - return 1; } @@ -1937,7 +1937,7 @@ uint8_t *fps_ptr = NULL; //pointer to the fps byte in the sequence header uint8_t *se_ptr = NULL; //pointer to sequence extension uint8_t *pce_ptr = NULL; //pointer to picture coding extension - int frames_diff, d1; //how any frames we advanced respect to the last one + int frames_diff, d1, gop_reset = 0; //how any frames we advanced respect to the last one mp_msg(MSGT_MUXER, MSGL_DBG2,"parse_mpeg12_video, len=%u\n", (uint32_t) len); if(s->buffer[0] != 0 || s->buffer[1] != 0 || s->buffer[2] != 1 || len<6) @@ -1989,12 +1989,24 @@ } - if(s->buffer[3]) { // Sequence or GOP -- scan for Picture - while (ptr < len-5 && + /*while (ptr < len-5 && (s->buffer[ptr] != 0 || s->buffer[ptr+1] != 0 || s->buffer[ptr+2] != 1 || s->buffer[ptr+3] != 0)) + ptr++;*/ + + do_loop: while (ptr < len-5 && + (s->buffer[ptr] != 0 || s->buffer[ptr+1] != 0 || s->buffer[ptr+2] != 1)) + ptr++; + + if(s->buffer[ptr+3] == 0xb8) + gop_reset = 1; + + if(s->buffer[ptr+3]) //not frame + { ptr++; + goto do_loop; + } } if (ptr >= len-5) @@ -2010,14 +2022,21 @@ if(!spriv->vframes) spriv->last_tr = spriv->max_tr = temp_ref; d1 = temp_ref - spriv->last_tr; + if(gop_reset) + { + frames_diff = spriv->max_tr + temp_ref - spriv->last_tr; + } + else + { if(d1 < -6) //there's a wraparound frames_diff = spriv->max_tr + 1 + temp_ref - spriv->last_tr; else if(d1 > 6) //there's a wraparound frames_diff = spriv->max_tr + 1 + spriv->last_tr - temp_ref; else frames_diff = d1; - mp_msg(MSGT_MUXER, MSGL_DBG2, "\nLAST: %d, TR: %d, DIFF: %d, MAX: %d, d1: %d\n", - spriv->last_tr, temp_ref, frames_diff, spriv->max_tr, d1); + } + mp_msg(MSGT_MUXER, MSGL_DBG2, "\nLAST: %d, TR: %d, GOP: %d, DIFF: %d, MAX: %d, d1: %d\n", + spriv->last_tr, temp_ref, gop_reset, frames_diff, spriv->max_tr, d1); if(!temp_ref) spriv->max_tr = 0; else if(temp_ref > spriv->max_tr) @@ -2648,11 +2667,11 @@ //calloc() already zero-ed all flags, so we assign only the ones we need if(conf_mux != NULL) { - if(! strcasecmp(conf_mux, "mpeg2")) + if(! strcasecmp(conf_mux, "mpeg1")) { - priv->mux = MUX_MPEG2; + priv->mux = MUX_MPEG1; priv->packet_size = 2048; - priv->is_genmpeg2 = 1; + priv->is_genmpeg1 = 1; priv->muxrate = 1800 * 125; //Constrained parameters } else if(! strcasecmp(conf_mux, "dvd")) @@ -2682,8 +2701,10 @@ } else { - priv->mux = MUX_MPEG1; - priv->is_genmpeg1 = 1; + if(strcasecmp(conf_mux, "mpeg2")) + mp_msg(MSGT_MUXER, MSGL_ERR, "Unknown format %s, default to mpeg2\n", conf_mux); + priv->mux = MUX_MPEG2; + priv->is_genmpeg2 = 1; priv->packet_size = 2048; priv->muxrate = 1800 * 125; //Constrained parameters }

1 0

CVS: main/libao2 ao_dxr2.c,1.10,1.11
by syncmail＠mplayerhq.hu 30 Nov '05

30 Nov '05

CVS change done by Tobias Diedrich CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv5881 Modified Files: ao_dxr2.c Log Message: Link was a bit dated (but still working :-)) Index: ao_dxr2.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_dxr2.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ao_dxr2.c 19 Jun 2005 09:17:44 -0000 1.10 +++ ao_dxr2.c 29 Nov 2005 19:53:05 -0000 1.11 @@ -98,7 +98,7 @@ #ifdef DXR2_AUDIO_FREQ_24 // This is not yet in the dxr2 driver CVS // you can get the patch at - // http://www.ranmachan.dyndns.org/~ranma/patches/dxr2.pcm1723.20020513 + // http://www.tdiedrich.de/~ranma/patches/dxr2.pcm1723.20020513 case 24000: freq_id=DXR2_AUDIO_FREQ_24; break;

3 2

CVS: main/libmpdemux muxer.c, 1.11, 1.12 muxer_avi.c, 1.32, 1.33 muxer_lavf.c, 1.13, 1.14 muxer_mpeg.c, 1.23, 1.24
by syncmail＠mplayerhq.hu 29 Nov '05

29 Nov '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv1395/libmpdemux Modified Files: muxer.c muxer_avi.c muxer_lavf.c muxer_mpeg.c Log Message: Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me Index: muxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- muxer.c 21 Nov 2005 22:53:14 -0000 1.11 +++ muxer.c 29 Nov 2005 22:04:57 -0000 1.12 @@ -62,7 +62,7 @@ tmp = realloc(s->muxer->muxbuf, (num+1) * sizeof(muxbuf_t)); if(!tmp) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot reallocate memory!\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, MSGTR_MuxbufReallocErr); return; } s->muxer->muxbuf = tmp; @@ -75,7 +75,7 @@ buf->flags = flags; buf->buffer = malloc(len * sizeof (unsigned char)); if (!buf->buffer) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot allocate memory!\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, MSGTR_MuxbufMallocErr); return; } memcpy(buf->buffer, s->buffer, buf->len); @@ -91,11 +91,10 @@ if (s->muxer->muxbuf_skip_buffer) { muxbuf_t *tmp_buf = malloc(sizeof(muxbuf_t)); if (!tmp_buf) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot allocate memory!\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, MSGTR_MuxbufMallocErr); return; } - mp_msg(MSGT_MUXER, MSGL_V, "Muxer frame buffer sending %d frame(s) to muxer.\n", - s->muxer->muxbuf_num); + mp_msg(MSGT_MUXER, MSGL_V, MSGTR_MuxbufSending, s->muxer->muxbuf_num); /* fix parameters for all streams */ for (num = 0; s->muxer->streams[num]; ++num) { @@ -105,7 +104,6 @@ } /* write header */ - mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingAVIHeader); if (s->muxer->cont_write_header) muxer_write_header(s->muxer); @@ -139,7 +137,7 @@ if(s->h.dwSampleSize){ // CBR s->h.dwLength+=len/s->h.dwSampleSize; - if(len%s->h.dwSampleSize) mp_msg(MSGT_MUXER, MSGL_WARN, "Warning! len isn't divisable by samplesize!\n"); + if(len%s->h.dwSampleSize) mp_msg(MSGT_MUXER, MSGL_WARN, MSGTR_WarningLenIsntDivisible); } else { // VBR s->h.dwLength++; Index: muxer_avi.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_avi.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- muxer_avi.c 21 Nov 2005 22:53:14 -0000 1.32 +++ muxer_avi.c 29 Nov 2005 22:04:57 -0000 1.33 @@ -18,6 +18,7 @@ #include "aviheader.h" #include "ms_hdr.h" #include "mp_msg.h" +#include "help_mp.h" extern char *info_name; extern char *info_artist; @@ -277,6 +278,7 @@ struct avi_stream_info *vsi = muxer->def_v->priv; int isodml = vsi->riffofspos > 0; + mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingHeader); if (aspect == 0) { mp_msg(MSGT_MUXER, MSGL_INFO, "ODML: Aspect information not (yet?) available or unspecified, not writing vprp header.\n"); } else { @@ -642,6 +644,7 @@ static void avifile_write_index(muxer_t *muxer){ struct avi_stream_info *vsi = muxer->def_v->priv; + mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingTrailer); if (vsi->riffofspos > 0){ avifile_odml_write_index(muxer); } else { Index: muxer_lavf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- muxer_lavf.c 21 Nov 2005 22:53:14 -0000 1.13 +++ muxer_lavf.c 29 Nov 2005 22:04:57 -0000 1.14 @@ -6,6 +6,7 @@ #include "config.h" #include "version.h" #include "mp_msg.h" +#include "help_mp.h" #include "bswap.h" #include "aviheader.h" @@ -266,9 +267,9 @@ { muxer_priv_t *priv = (muxer_priv_t *) muxer->priv; + mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingHeader); av_write_header(priv->oc); muxer->cont_write_header = NULL; - mp_msg(MSGT_MUXER, MSGL_INFO, "WRITTEN HEADER\n"); } @@ -277,8 +278,8 @@ int i; muxer_priv_t *priv = (muxer_priv_t *) muxer->priv; + mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingTrailer); av_write_trailer(priv->oc); - mp_msg(MSGT_MUXER, MSGL_INFO, "WRITTEN TRAILER\n"); for(i = 0; i < priv->oc->nb_streams; i++) { av_freep(&(priv->oc->streams[i])); Index: muxer_mpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- muxer_mpeg.c 21 Nov 2005 22:53:14 -0000 1.23 +++ muxer_mpeg.c 29 Nov 2005 22:04:57 -0000 1.24 @@ -7,6 +7,7 @@ #include "config.h" #include "version.h" #include "mp_msg.h" +#include "help_mp.h" #include "bswap.h" @@ -2555,6 +2556,8 @@ double fake_timer; muxer_priv_t *priv = (muxer_priv_t *) muxer->priv; + mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingTrailer); + for(i = 0; i < muxer->avih.dwStreams; i++) { if(muxer->streams[i]->type == MUXER_TYPE_AUDIO) @@ -2572,6 +2575,8 @@ { muxer_priv_t *priv = (muxer_priv_t*) muxer->priv; + mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingHeader); + priv->headers_cnt++; if((priv->is_genmpeg1 || priv->is_genmpeg2) && (priv->headers_cnt == muxer->avih.dwStreams))

1 0

CVS: main mencoder.c,1.320,1.321
by syncmail＠mplayerhq.hu 29 Nov '05

29 Nov '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv1395 Modified Files: mencoder.c Log Message: Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- mencoder.c 21 Nov 2005 22:53:14 -0000 1.320 +++ mencoder.c 29 Nov 2005 22:04:56 -0000 1.321 @@ -1508,10 +1508,8 @@ if(aencoder->fixup) aencoder->fixup(aencoder); -mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_WritingAVIIndex); if (muxer->cont_write_index) muxer_write_index(muxer); muxer_f_size=ftello(muxer_f); -mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_FixupAVIHeader); fseek(muxer_f,0,SEEK_SET); if (muxer->cont_write_header) muxer_write_header(muxer); // update header if(ferror(muxer_f) || fclose(muxer_f) != 0) {

1 0

CVS: main/libmpcodecs ve_lavc.c,1.120,1.121
by syncmail＠mplayerhq.hu 29 Nov '05

29 Nov '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv19620/libmpcodecs Modified Files: ve_lavc.c Log Message: Fixed wrong M_OPT_RANGE in vrc_maxrate/vrc_minrate , default was 0 and range [4,2400000] Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- ve_lavc.c 18 Nov 2005 14:39:22 -0000 1.120 +++ ve_lavc.c 29 Nov 2005 04:16:46 -0000 1.121 @@ -207,8 +207,8 @@ {"vqmod_freq", &lavc_param_rc_qmod_freq, CONF_TYPE_INT, 0, 0, 0, NULL}, {"vrc_eq", &lavc_param_rc_eq, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"vrc_override", &lavc_param_rc_override_string, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL}, - {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL}, + {"vrc_maxrate", &lavc_param_rc_max_rate, CONF_TYPE_INT, CONF_RANGE, 0, 24000000, NULL}, + {"vrc_minrate", &lavc_param_rc_min_rate, CONF_TYPE_INT, CONF_RANGE, 0, 24000000, NULL}, {"vrc_buf_size", &lavc_param_rc_buffer_size, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL}, {"vrc_buf_aggressivity", &lavc_param_rc_buffer_aggressivity, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 99.0, NULL}, {"vrc_init_cplx", &lavc_param_rc_initial_cplx, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 9999999.0, NULL},

1 0

CVS: main/DOCS/tech manpage.txt,1.27,1.28
by syncmail＠mplayerhq.hu 29 Nov '05

29 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv28362/DOCS/tech Modified Files: manpage.txt Log Message: Sync man page structure description with actual man page structure. Index: manpage.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/manpage.txt,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- manpage.txt 6 Oct 2005 12:29:43 -0000 1.27 +++ manpage.txt 29 Nov 2005 01:12:03 -0000 1.28 @@ -123,11 +123,12 @@ Codec specific option descriptions (lavc,divx4,xvid,lame) (MEncoder only). FILES A list and description of all installed/used files/directories. -EXAMPLES +EXAMPLES OF MPLAYER USAGE + Basic examples. Again: no long descriptions/processes. +EXAMPLES OF MENCODER USAGE Basic examples. Again: no long descriptions/processes. BUGS AUTHORS -STANDARD DISCLAIMER

1 0

CVS: main/etc example.conf,1.62,1.63
by syncmail＠mplayerhq.hu 29 Nov '05

29 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/etc In directory mail:/var2/tmp/cvs-serv9532/etc Modified Files: example.conf Log Message: Smarter defaults, removing obsolete options. Index: example.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/example.conf,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- example.conf 28 Nov 2005 23:54:08 -0000 1.62 +++ example.conf 29 Nov 2005 00:02:58 -0000 1.63 @@ -5,7 +5,7 @@ ## and per user from ~/.mplayer/config, where per-user settings override ## system-wide settings, all of which are overrriden by the command line. ## -## The options are the same as on the command line. +## The options are the same as on the command line without the preceding '-'. ## @@ -24,7 +24,7 @@ # Change to a different videomode when going fullscreen # (dga, x11, sdl video output drivers only). -# vm=no +# vm=yes # Force changing display depth (valid settings are: 0, 15, 16, 24, 32). # May need 'vm=yes' as well, only works with fbdev, dga, svga, vesa @@ -33,10 +33,7 @@ # Enable software scaling (powerful CPU needed). # Some video output drivers (svga, x11, vesa) do not support hardware scaling. -# zoom=no - -# Doublebuffering can help remove flicker from subtitles/OSD. -# double=yes +# zoom=yes # standard monitor size, with square pixels # monitoraspect=4:3 @@ -49,10 +46,10 @@ ## ## Specify your preferred default skin here -## (skins are searched in /usr/local/share/mplayer/Skin/yourskin -## and ~/.mplayer/Skin/yourskin) +## (skins are searched for in /usr/local/share/mplayer/Skin/ +## and ~/.mplayer/Skin/). ## -# skin = default +# skin = Abyss ## ## Multiple languages are available :) @@ -84,9 +81,6 @@ ## ## FBdev driver: ## -# framebuffer device to use -# fb = /dev/fb0 -# # mode to use (read from fb.modes) # fbmode = 640x480-120 # @@ -120,12 +114,6 @@ # # Use SDL audio driver with the esd subdriver by default. # ao = sdl:esd -# -# Turn off XVideo hardware acceleration. -# noxv = no -# -# Force XVideo even if not detected. -# forcexv = yes ##

1 0

CVS: main/etc example.conf,1.61,1.62
by syncmail＠mplayerhq.hu 28 Nov '05

28 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/etc In directory mail:/var2/tmp/cvs-serv18424/etc Modified Files: example.conf Log Message: -aop is long obsolete. Index: example.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/example.conf,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- example.conf 23 Aug 2005 17:03:30 -0000 1.61 +++ example.conf 28 Nov 2005 23:54:08 -0000 1.62 @@ -155,8 +155,8 @@ ## This is the correct way to use "subconfig" type options in the ## configuration file. In the command line you use: -## -aop list=resample:fout=44100 , but here it is: -# aop=list=resample:fout=44100 +## -af lavcresample=44100 , but here it is: +# af=lavcresample=44100 ## ## You can also include other configfiles

1 0

CVS: main/libao2 ao_oss.c,1.56,1.57
by syncmail＠mplayerhq.hu 28 Nov '05

28 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main/libao2 In directory mail:/var2/tmp/cvs-serv5111/libao2 Modified Files: ao_oss.c Log Message: -aop is long obsolete. Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ao_oss.c 19 Nov 2005 14:35:45 -0000 1.56 +++ ao_oss.c 28 Nov 2005 23:43:24 -0000 1.57 @@ -319,7 +319,7 @@ } #if 0 if(oss_format!=format2oss(format)) - mp_msg(MSGT_AO,MSGL_WARN,"WARNING! Your soundcard does NOT support %s sample format! Broken audio or bad playback speed are possible! Try with '-aop list=format'\n",audio_out_format_name(format)); + mp_msg(MSGT_AO,MSGL_WARN,"WARNING! Your soundcard does NOT support %s sample format! Broken audio or bad playback speed are possible! Try with '-af format'\n",audio_out_format_name(format)); #endif ao_data.format = oss2format(oss_format);

1 0