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

19 Dec '02

1 0

CVS: main/libmpcodecs vf_pp.c,1.20,1.21
by Arpi of Ize 19 Dec '02

19 Dec '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv28683 Modified Files: vf_pp.c Log Message: fixed memleak caused by multiple config() calls - thx Gabu Index: vf_pp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- vf_pp.c 6 Nov 2002 23:54:24 -0000 1.20 +++ vf_pp.c 19 Dec 2002 22:33:59 -0000 1.21 @@ -37,6 +37,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int voflags, unsigned int outfmt){ + if(vf->priv->context) pp_free_context(vf->priv->context); vf->priv->context= pp_get_context(width, height, (gCpuCaps.hasMMX ? PP_CPU_CAPS_MMX : 0) | (gCpuCaps.hasMMX2 ? PP_CPU_CAPS_MMX2 : 0)

1 0

CVS: main/DOCS/Hungarian cd-dvd.html,1.38,1.39
by Winner of tha face compo 19 Dec '02

19 Dec '02

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mail:/var/tmp.root/cvs-serv14816/Hungarian Modified Files: cd-dvd.html Log Message: sync Index: cd-dvd.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/cd-dvd.html,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cd-dvd.html 11 Nov 2002 05:07:26 -0000 1.38 +++ cd-dvd.html 19 Dec 2002 21:37:21 -0000 1.39 @@ -38,6 +38,8 @@     <CODE>echo file_readahead:2000000 >/proc/ide/[meghajtó]/settings</CODE> Ez 2Mb-ot olvas elõre olvasáskor (karcos CDROM-oknál hasznos). + Ha túl magasra állítod, a folytonosan fel-, és lepörgõ meghajtó drámai + teljesítménycsökkenést fog okozni. Ajánlott továbbá a 'hdparm' program használata:     <CODE>hdparm -d1 -a8 -u1 (meghajtó)</CODE>

1 0

CVS: main/DOCS encoding.html,1.72,1.73
by Winner of tha face compo 19 Dec '02

19 Dec '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv13160 Modified Files: encoding.html Log Message: more_options removed Index: encoding.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- encoding.html 15 Dec 2002 15:42:44 -0000 1.72 +++ encoding.html 19 Dec 2002 21:36:44 -0000 1.73 @@ -32,9 +32,9 @@ can come from a previous 3-pass encoding (it interferes with current one) <CODE>    mencoder -dvd 2 -ovc lavc -lavcopts - vcodec=mpeg4:vpass=1:more_options -oac copy -o movie.avi + vcodec=mpeg4:vpass=1 -oac copy -o movie.avi     mencoder -dvd 2 -ovc lavc -lavcopts - vcodec=mpeg4:vpass=2:more_options -oac copy -o movie.avi</CODE> + vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE> 3-pass encoding: this is an extension of 2-pass encoding, where the audio encoding takes place in a separate pass. This method enables @@ -45,7 +45,7 @@ <LI>Remove conflicting temporary file: <CODE>rm frameno.avi</CODE></LI> <LI>First pass: - <CODE>mencoder <file/DVD> -ovc frameno -oac mp3lame -lameopts vbr=3:more_options -o frameno.avi</CODE> + <CODE>mencoder <file/DVD> -ovc frameno -oac mp3lame -lameopts vbr=3 -o frameno.avi</CODE> An audio-only avi file will be created, containing only the requested audio stream. Don't forget <CODE>-lameopts</CODE>, if you need to set it. If you were encoding a long movie, MEncoder @@ -72,11 +72,11 @@ which can come from a previous 3-pass encoding (it interferes with current one) <CODE>    mencoder -dvd 2 -ovc frameno - -o frameno.avi -oac mp3lame -lameopts vbr=3:more_options + -o frameno.avi -oac mp3lame -lameopts vbr=3     mencoder -dvd 2 -ovc lavc - -lavcopts vcodec=mpeg4:vpass=1:more_options -oac copy -o movie.avi + -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi     mencoder -dvd 2 -ovc lavc - -lavcopts vcodec=mpeg4:vpass=2:more_options -oac copy -o movie.avi</CODE> + -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o movie.avi</CODE> <H3><A NAME="rescaling">2.4.2 Rescaling movies</A></H3> @@ -94,7 +94,7 @@ <H5>Usage:</H5> <CODE>    mencoder input.mpg -ovc lavc -lavcopts - vcodec=mpeg4:more_options -vop scale=640:480 -oac copy -o + vcodec=mpeg4 -vop scale=640:480 -oac copy -o output.avi</CODE>

1 0

CVS: main/DOCS cd-dvd.html,1.51,1.52
by Winner of tha face compo 19 Dec '02

19 Dec '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv12554 Modified Files: cd-dvd.html Log Message: too big readahead can be bad Index: cd-dvd.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/cd-dvd.html,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- cd-dvd.html 31 Oct 2002 05:07:43 -0000 1.51 +++ cd-dvd.html 19 Dec 2002 21:35:30 -0000 1.52 @@ -42,6 +42,8 @@     <CODE>echo file_readahead:2000000 > /proc/ide/[cdrom device]/settings</CODE> This sets prefetched file reading to 2MB, which helps with scratched CD-ROMs. + If you set it to too high, the drive will continuously spin up and down, and + will dramatically decrease the performance. It is recommended that you also tune your CD-ROM drive with hdparm:     <CODE>hdparm -d1 -a8 -u1 (cdrom device)</CODE>

1 0

CVS: main/libmpdemux tv.c,1.43,1.44 tv.h,1.19,1.20
by Jindrich Makovicka CVS 19 Dec '02

19 Dec '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv17091/libmpdemux Modified Files: tv.c tv.h Log Message: add a TV_SET_CNANNEL command Index: tv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- tv.c 16 Dec 2002 23:38:56 -0000 1.43 +++ tv.c 19 Dec 2002 10:09:43 -0000 1.44 @@ -554,6 +554,27 @@ return(1); } +int tv_set_channel(tvi_handle_t *tvh, char *channel) +{ + int i; + struct CHANLIST cl; + + for (i = 0; i < chanlists[tvh->chanlist].count; i++) + { + cl = tvh->chanlist_s[i]; +// printf("count%d: name: %s, freq: %d\n", +// i, cl.name, cl.freq); + if (!strcasecmp(cl.name, channel)) + { + tvh->channel = i; + mp_msg(MSGT_TV, MSGL_INFO, "Selected channel: %s (freq: %.3f)\n", + cl.name, (float)cl.freq/1000); + tv_set_freq(tvh, (unsigned long)(((float)cl.freq/1000)*16)); + break; + } + } +} + int tv_step_norm(tvi_handle_t *tvh) { return(1); Index: tv.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/tv.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- tv.h 16 Dec 2002 17:05:49 -0000 1.19 +++ tv.h 19 Dec 2002 10:09:43 -0000 1.20 @@ -148,6 +148,8 @@ #define TV_CHANNEL_LOWER 1 #define TV_CHANNEL_HIGHER 2 +int tv_set_channel(tvi_handle_t *tvh, char *channel); + int tv_step_norm(tvi_handle_t *tvh); int tv_step_chanlist(tvi_handle_t *tvh);

1 0

CVS: main/input input.c,1.62,1.63 input.h,1.26,1.27
by Jindrich Makovicka CVS 19 Dec '02

19 Dec '02

Update of /cvsroot/mplayer/main/input In directory mail:/var/tmp.root/cvs-serv17091/input Modified Files: input.c input.h Log Message: add a TV_SET_CNANNEL command Index: input.c =================================================================== RCS file: /cvsroot/mplayer/main/input/input.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- input.c 5 Dec 2002 00:15:56 -0000 1.62 +++ input.c 19 Dec 2002 10:09:42 -0000 1.63 @@ -74,6 +74,7 @@ { MP_CMD_TV_STEP_CHANNEL, "tv_step_channel", 1, { { MP_CMD_ARG_INT ,{0}}, {-1,{0}} }}, { MP_CMD_TV_STEP_NORM, "tv_step_norm",0, { {-1,{0}} } }, { MP_CMD_TV_STEP_CHANNEL_LIST, "tv_step_chanlist", 0, { {-1,{0}} } }, + { MP_CMD_TV_SET_CHANNEL, "tv_set_channel", 1, { { MP_CMD_ARG_STRING, {0}}, {-1,{0}} }}, #endif { MP_CMD_VO_FULLSCREEN, "vo_fullscreen", 0, { {-1,{0}} } }, { MP_CMD_SCREENSHOT, "screenshot", 0, { {-1,{0}} } }, Index: input.h =================================================================== RCS file: /cvsroot/mplayer/main/input/input.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- input.h 5 Dec 2002 00:15:56 -0000 1.26 +++ input.h 19 Dec 2002 10:09:42 -0000 1.27 @@ -19,6 +19,7 @@ #define MP_CMD_TV_STEP_CHANNEL 17 #define MP_CMD_TV_STEP_NORM 18 #define MP_CMD_TV_STEP_CHANNEL_LIST 19 +#define MP_CMD_TV_SET_CHANNEL 37 #define MP_CMD_VO_FULLSCREEN 20 #define MP_CMD_SUB_POS 21 #define MP_CMD_DVDNAV 22

1 0

CVS: main mplayer.c,1.627,1.628
by Jindrich Makovicka CVS 19 Dec '02

19 Dec '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv17091 Modified Files: mplayer.c Log Message: add a TV_SET_CNANNEL command Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.627 retrieving revision 1.628 diff -u -r1.627 -r1.628 --- mplayer.c 15 Dec 2002 23:45:19 -0000 1.627 +++ mplayer.c 19 Dec 2002 10:09:27 -0000 1.628 @@ -2288,6 +2288,10 @@ tv_step_channel((tvi_handle_t*)(demuxer->priv), TV_CHANNEL_LOWER); } } break; + case MP_CMD_TV_SET_CHANNEL : { + if (tv_param_on == 1) + tv_set_channel((tvi_handle_t*)(demuxer->priv), cmd->args[0].v.s); + } break; case MP_CMD_TV_STEP_NORM : { if (tv_param_on == 1) tv_step_norm((tvi_handle_t*)(demuxer->priv));

1 0

CVS: main/help help_mp-bg.h,1.7,1.8
by Ivan Kalvachev CVS 18 Dec '02

18 Dec '02

Update of /cvsroot/mplayer/main/help In directory mail:/var/tmp.root/cvs-serv16390 Modified Files: help_mp-bg.h Log Message: Index: help_mp-bg.h =================================================================== RCS file: /cvsroot/mplayer/main/help/help_mp-bg.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- help_mp-bg.h 19 Oct 2002 20:26:04 -0000 1.7 +++ help_mp-bg.h 18 Dec 2002 23:49:01 -0000 1.8 @@ -20,7 +20,7 @@ " -vo <drv[:dev]> Èçáèðà âèäåî èçõîä (äðàéâåð è óñòðîéñòâî) (âèæ '-vo help')\n" " -ao <drv[:dev]> Èçáèðà àóäèî èçõîä (äðàéâåð è óñòðîéñòâî) (âèæ '-ao help')\n" #ifdef HAVE_VCD -" -vcd <trackno> Ïóñêà VCD (Âèäåî Êîïàêò Äèñê) ïúòå÷êà, âìåñòî ôàéë\n" +" -vcd <trackno> Ïóñêà VCD (Âèäåî Êîïàêò Äèñê) ïèñòà, âìåñòî ôàéë\n" #endif #ifdef HAVE_LIBCSS " -dvdauth <dev> Óêàçâà DVD óñòðîéñòâî çà äåøèôðèðàíå (ïðè êîäèðàíè äèñêîâå)\n" @@ -76,6 +76,7 @@ #define MSGTR_InvalidVOdriver "Íåâàëèäíî èìå íà âèäåî äðàéâåð: %s\nÈçïîëçâàé '-vo help' çà ñïèñúê íà íàëè÷íèòå âèäåî äðàéâåðè.\n" #define MSGTR_InvalidAOdriver "Íåâàëèäíî èìå íà àóäèî äðàéâåð: %s\nÈçïîëçâàé '-ao help' çà ñïèñúê íà íàëè÷íèòå àóäèî äðàéâåðè.\n" #define MSGTR_CopyCodecsConf "(êîïèðàé/ñâúðæè etc/codecs.conf (îò ñîðñ êîäà íà MPlayer) ñ ~/.mplayer/codecs.conf)\n" + #define MSGTR_BuiltinCodecsConf "Èçïîëçâàì âãðàäåíèÿ codecs.conf\n" #define MSGTR_CantLoadFont "Íå ìîãà äà çàðåäÿ øðèôò: %s\n" #define MSGTR_CantLoadSub "Íå ìîãà çà çàðåäÿ ñóáòèòðè: %s\n" #define MSGTR_ErrorDVDkey "Ãðåøêà ïðè îáðàáîòêà íà DVD KEY (êëþ÷úò íåâàëèäåí).\n" @@ -105,12 +106,15 @@ "- Íàé-âåðîÿòíî: \"ðàçâàëåí\" àóäèî äðàéâåð. íàñòðîéêà: Îïèòàé -ao sdl èëè\n"\ " èçïîëçâàé ALSA 0.5 èëè OSS åìóëàöèÿ íà ALSA 0.9. Ïðî÷åòè DOCS/sound.html\n"\ " çà îùå ñúâåòè!\n"\ +" Ìîæå äà ïðîáâàø îïöèÿòà -autosync 30\n"\ "- Áàâíî âèäåî. Ïðîáâàé ñ ðàçëè÷íè -vo äðàéâåðè (çà ïúëåí ñïèñúê: -vo help)\n"\ " èëè ïðîáâàé ñ îïöèÿ -framedrop ! Ïðî÷åòè DOCS/video.html çà îùå íàñòðîéêè.\n"\ "- Áàâåí ïðîöåñîð. Íå ñå îïèòâàé äà ïóñêàø dvd/divx ñ ãîëÿì ðàçìåð íà êàäðèòå\n"\ -" íà áàâåí ïðîöåñîð! Ïîñëåäíî ñïàñåíèå -hardframedrop\n"\ +" íà áàâåí ïðîöåñîð! Ïîñëåäíî ñïàñåíèå -hardframedrop\n"\ "- Ðàçâàëåí ôàéë. Îïèòàé ðàçëè÷íè êîìáèíàöèè îò òåçè îïöèè:\n"\ " -nobps -ni -mc 0 -forceidx\n"\ +"- Àêî ïóñêàø îò áàâåí èçòî÷íèê (nfs/smb ìðåæà, cd, dvd, vcd è ò.í.)\n"\ +" îïèòàé ñ -cache 8192\n"\ "- Èçïîëçâàø îïöèÿ -cache ïðè íåïðàâèëíî ñòðóêòóðèðàí ôàéë (non-interleaved)? \n"\ " Îïèòàé ñ -nocache\n"\ "Àêî íèùî íå ïîìîãíå, ïðî÷åòè DOCS/bugreports.html !\n\n" @@ -135,6 +139,7 @@ #define MSGTR_InitializingAudioCodec "Ïóñêàì àóäèî äåêîäåð...\n" #define MSGTR_ErrorInitializingVODevice "Ãðåøêà ïðè îòâàðÿíå/ïóñêàíå íà âèäåî äðàéâåðà (-vo) !\n" #define MSGTR_ForcedVideoCodec "Íàëîæåí âèäåî äåêîäåð: %s\n" +#define MSGTR_ForcedAudioCodec "Íàëîæåí àóäèî äåêîäåð: %s\n" #define MSGTR_AODescription_AOAuthor "AO: Îïèñàíèå: %s\nAO: Àâòîð: %s\n" #define MSGTR_AOComment "AO: Êîìåíòàð: %s\n" #define MSGTR_Video_NoVideo "Âèäåî: íÿìà âèäåî! ! !\n" @@ -149,15 +154,15 @@ #define MSGTR_MissingFilename "\nËèïñâà èìå íà ôàéë!\n\n" #define MSGTR_CannotOpenFile_Device "Íå ìîãà äà îòâîðÿ ôàéë/óñòðîéñòâî\n" #define MSGTR_ErrorDVDAuth "Ãðåøêà ïðè DVD auth...\n" - #define MSGTR_CannotOpenDemuxer "Íå ìîãà äà îòâîðÿ demuxer\n" - #define MSGTR_NoAudioEncoderSelected "\nÍå å ïîñî÷åí àóäèî åíêîäåð (-oac)! Èçáåðåòå åäèí èëè èçïîëçâàéòå -nosound.\nÂèæòå -oac help !\n" - #define MSGTR_NoVideoEncoderSelected "\nÍå å ïîñî÷åí âèäåî åíêîäåð (-ovc)! Èçáåðåòå åäèí, Âèæòå -ovc help !\n" + #define MSGTR_CannotOpenDemuxer "Íå ìîãà äà îòâîðÿ demuxer (ðàçïðåäåëèòåë)\n" +#define MSGTR_NoAudioEncoderSelected "\nÍå å ïîñî÷åí àóäèî åíêîäåð (-oac)! Èçáåðåòå åäèí èëè èçïîëçâàéòå -nosound.\nÂèæòå -oac help !\n" +#define MSGTR_NoVideoEncoderSelected "\nÍå å ïîñî÷åí âèäåî åíêîäåð (-ovc)! Èçáåðåòå åäèí, Âèæòå -ovc help !\n" // #define MSGTR_InitializingAudioCodec "Èíèöèàëèçèðàì àóäèî codec...\n" #define MSGTR_CannotOpenOutputFile "Íå ìîãà äà îòâîðÿ èçõîäÿùèÿ ôàéë '%s'\n" - #define MSGTR_EncoderOpenFailed "Íå óñïÿõ äà îòâîðÿ åíêîäåð\n" +#define MSGTR_EncoderOpenFailed "Íå óñïÿõ äà îòâîðÿ åíêîäåð\n" #define MSGTR_ForcingOutputFourcc "Íàëàãàì fourcc êîäà äà áúäå %x [%.4s]\n" #define MSGTR_WritingAVIHeader "Çàïèñâàì AVI header...\n" -#define MSGTR_DuplicateFrames "\nïîâòàðÿì %d êàäúð(à)!!!\n" +#define MSGTR_DuplicateFrames "\nïîâòàðÿì %d êàäúð(è)!!!\n" #define MSGTR_SkipFrame "\nïðîïóñêàì êàäúð!!!\n" #define MSGTR_ErrorWritingFile "%s: ãðåøêà ïðè ïèñàíå âúâ ôàéëà.\n" #define MSGTR_WritingAVIIndex "\nÇàïèñâàì AVI index...\n" @@ -168,12 +173,16 @@ // open.c, stream.c: #define MSGTR_CdDevNotfound "CD-ROM Óñòðîéñòâî '%s' íå å íàìåðåíî!\n" -#define MSGTR_ErrTrackSelect "Ãðåøêà ïðè èçáîðà íà VCD ïúòå÷êà!" +#define MSGTR_ErrTrackSelect "Ãðåøêà ïðè èçáîðà íà VCD ïèñòà!" #define MSGTR_ReadSTDIN "Ùå ÷åòà îò ñòàíäàðòíèÿ âõîä stdin...\n" #define MSGTR_UnableOpenURL "Íà ìîãà äà îòâîðÿ URL àäðåñ: %s\n" #define MSGTR_ConnToServer "Óñòàíîâèõ âðúçêà ñúñ ñúðâúð: %s\n" #define MSGTR_FileNotFound "Íå íàìèðàì ôàéë: '%s'\n" +#define MSGTR_SMBInitError "Íå ìîãà äà ïóñíà libsmbclient : %d\n" +#define MSGTR_SMBFileNotFound "Íå ìîãà äà îòâîðÿ ôàéëà ïî ìðåæàòà: '%s'\n" +#define MSGTR_SMBNotCompiled "MPlayer íå å êîìïèëèðàí ñ ïîääðúæêà íà SMB ìðåæà\n" + #define MSGTR_CantOpenDVD "Íå ìîãà äà îòâîðÿ DVD óñòðîéñòâî: %s\n" #define MSGTR_DVDwait "×åòà èíôîðìàöèÿòà íà DVD äèñêà, ìîëÿ èç÷àêàéòå...\n" #define MSGTR_DVDnumTitles "Èìà %d çàãëàâèÿ íà òîâà DVD.\n" @@ -259,8 +268,8 @@ #define MSGTR_UsingExternalPP "[PP] Èçïîëçâàì ñîáñòâåí postprocessing ôèëòúð, ìàêñèìàëíî êà÷åñòâî q = %d\n" #define MSGTR_UsingCodecPP "[PP] Èçïîëçâàì postprocessing íà äåêîäåðà, ìàêñèìàëíî êà÷åñòâî q = %d\n" #define MSGTR_VideoAttributeNotSupportedByVO_VD "Âèäåî àòðèáóòúò '%s' íå ñå ïîääúðæà îò òåêóùèòå vo & vd! \n" -#define MSGTR_VideoCodecFamilyNotAvailableStr "Ïîñî÷åíàòà ôàìèëèÿ çà âèäåî äåêîäåð [%s] (vfm=%s) íå å äîñòúïíà (âêëþ÷åòå ÿ ïî âðåìå íà êîìïèëàöèÿ!)\n" -#define MSGTR_AudioCodecFamilyNotAvailableStr "Ïîñî÷åíàòà ôàìèëèÿ çà àóäèî äåêîäåð [%s] (afm=%s) íå å äîñòúïíà (âêëþ÷åòå ÿ ïî âðåìå íà êîìïèëÿöèÿ!)\n" +#define MSGTR_VideoCodecFamilyNotAvailableStr "Ïîñî÷åíàòà ôàìèëèÿ çà âèäåî äåêîäåð [%s] (vfm=%s) íå å äîñòúïíà\n (âêëþ÷åòå ÿ ïî âðåìå íà êîìïèëàöèÿ!)\n" +#define MSGTR_AudioCodecFamilyNotAvailableStr "Ïîñî÷åíàòà ôàìèëèÿ çà àóäèî äåêîäåð [%s] (afm=%s) íå å äîñòúïíà\n (âêëþ÷åòå ÿ ïî âðåìå íà êîìïèëÿöèÿ!)\n" #define MSGTR_OpeningVideoDecoder "Îòâàðÿì âèäåî äåêîäåð: [%s] %s\n" #define MSGTR_OpeningAudioDecoder "Îòâàðÿì àóäèî äåêîäåð: [%s] %s\n" #define MSGTR_UninitVideoStr "ñïèðàì âèäåî: %s \n" @@ -308,7 +317,7 @@ #define MSGTR_Preferences "Íàñòðîéêè" #define MSGTR_OSSPreferences "Êîíôèãóðàöèÿ íà OSS äðàéâåðà" #define MSGTR_NoMediaOpened "no media opened" -#define MSGTR_VCDTrack "VCD ïúòå÷êà %d" +#define MSGTR_VCDTrack "VCD ïèñòà %d" #define MSGTR_NoChapter "íÿìà ãëàâè" #define MSGTR_Chapter "ãëàâà %d" #define MSGTR_NoFileLoaded "íÿìà çàðåäåí ôàéë" @@ -388,6 +397,12 @@ #define MSGTR_MENU_SkinBrowser "Èçáîð íà êîæà" #define MSGTR_MENU_Preferences "Íàñòðîéêè" #define MSGTR_MENU_Exit "Èçõîä ..." + #define MSGTR_MENU_Mute "Çàìúë÷è" + #define MSGTR_MENU_Original "Íåïðîìåíåíî" + #define MSGTR_MENU_AspectRatio "Ñúîòíîøåíèå" + #define MSGTR_MENU_AudioTrack "Àóäèî ïèñòà" + #define MSGTR_MENU_Track "Ïèñòà %d" + #define MSGTR_MENU_VideoTrack "Âèäåî ïèñòà" // --- equalizer #define MSGTR_EQU_Audio "Àóäèî" @@ -411,6 +426,11 @@ #define MSGTR_PLAYLIST_DirectoryTree "Äèðåêòîðèè" // --- preferences +#define MSGTR_PREFERENCES_Audio "Àóäèî" +#define MSGTR_PREFERENCES_Video "Âèäåî" +#define MSGTR_PREFERENCES_SubtitleOSD "Ñóáòèòðè & OSD" + #define MSGTR_PREFERENCES_Misc "Ðàçíè" + #define MSGTR_PREFERENCES_None "Íèùî" #define MSGTR_PREFERENCES_AvailableDrivers "Íàëè÷íè äðàéâåðè:" #define MSGTR_PREFERENCES_DoNotPlaySound "Áåç çâóê" @@ -419,14 +439,12 @@ #define MSGTR_PREFERENCES_ExtraStereo "Âêëþ÷è äîïúëíèòåëíî ñòåðåî" #define MSGTR_PREFERENCES_Coefficient "Êîåôèöèåíò:" #define MSGTR_PREFERENCES_AudioDelay "Çàêúñíåíèå:" -#define MSGTR_PREFERENCES_Audio "Àóäèî" #define MSGTR_PREFERENCES_DoubleBuffer "Âêëþ÷è äâîéíî áóôåðèðàíå" #define MSGTR_PREFERENCES_DirectRender "Âêëþ÷è äèðåêòíî ÷åðòàíå" #define MSGTR_PREFERENCES_FrameDrop "Âêëþ÷è ïðîïóñêàíå íà êàäðè" #define MSGTR_PREFERENCES_HFrameDrop "Âêëþ÷è ÑÈËÍÎ ïðîïóñêàíå íà êàäðè( îïàñíî )" #define MSGTR_PREFERENCES_Flip "Îáúðíè èçîáðàæåíèåòî îòãîðå-íàäîëó" #define MSGTR_PREFERENCES_Panscan "Panscan: " -#define MSGTR_PREFERENCES_Video "Âèäåî" #define MSGTR_PREFERENCES_OSDTimer "×àñîâíèê è êîíòðîëè" #define MSGTR_PREFERENCES_OSDProgress "Ñàìî âðåìåííè êîíòðîëè" #define MSGTR_PREFERENCES_Subtitle "Ñóáòèòðè:" @@ -450,10 +468,11 @@ #define MSGTR_PREFERENCES_FRAME_Font "Øðèôò" #define MSGTR_PREFERENCES_FRAME_PostProcess "Postprocess" #define MSGTR_PREFERENCES_FRAME_CodecDemuxer "Codec & demuxer" + #define MSGTR_PREFERENCES_FRAME_Cache "Cache" + #define MSGTR_PREFERENCES_FRAME_Misc "Ðàçíè" #define MSGTR_PREFERENCES_OSS_Device "Device:" #define MSGTR_PREFERENCES_OSS_Mixer "Mixer:" #define MSGTR_PREFERENCES_Message "Íå çàáðàâÿéòå, ÷å íÿêîè îïöèè îñòàâàò â ñèëà äî ñëåäâàùèÿ ôèëì." - #define MSGTR_PREFERENCES_DXR3_VENC "Âèäåî åíêîäåð:" #define MSGTR_PREFERENCES_DXR3_LAVC "LAVC (ffmpeg)" #define MSGTR_PREFERENCES_DXR3_FAME "FAME" @@ -483,11 +502,16 @@ #define MSGTR_PREFERENCES_FontPropHeight "Ïðîïîðöèîíàëíî ïî âèñî÷èíàòà íà êàäúðà" #define MSGTR_PREFERENCES_FontPropDiagonal "Ïðîïîðöèîíàëíî ïî äèàãîíàëà íà êàäúðà" #define MSGTR_PREFERENCES_FontEncoding "Çíàêîâà òàáëèöà:" - #define MSGTR_PREFERENCES_FontBlur "Ðàçìàçâàíå íà ñÿíêàòà:" - #define MSGTR_PREFERENCES_FontOutLine "Äåáåëèíà íà ñÿíêàòà:" +#define MSGTR_PREFERENCES_FontBlur "Ðàçìàçâàíå íà ñÿíêàòà:" +#define MSGTR_PREFERENCES_FontOutLine "Äåáåëèíà íà ñÿíêàòà:" #define MSGTR_PREFERENCES_FontTextScale "Ìàùàá íà òåêñòà:" #define MSGTR_PREFERENCES_FontOSDScale "Ìàùàá íà OSD:" -#define MSGTR_PREFERENCES_SubtitleOSD "Ñóáòèòðè & OSD" +#define MSGTR_PREFERENCES_Cache "Êåøèðàíå íà âõîäíèÿ ïîòîê" +#define MSGTR_PREFERENCES_LoadFullscreen "Ñòàðò íà öÿë åêðàí" +#define MSGTR_PREFERENCES_CacheSize "Ãîëåìèíà íà êåøà: " + #define MSGTR_PREFERENCES_XSCREENSAVER "Èçêëþ÷è XScreenSaver" +#define MSGTR_PREFERENCES_AutoSync "Àâòîíîìíà ñèíõðîíèçÿöèÿ (ïðè áúãàâè çâóêîâè êàðòè) " + #define MSGTR_PREFERENCES_AutoSyncValue "Ñòåïåí íà Autosync:" // --- messagebox #define MSGTR_MSGBOX_LABEL_FatalError "Ôàòàëíà ãðåøêà ..."

1 0

CVS: main/libmpcodecs ve_lavc.c,1.46,1.47
by Michael Niedermayer CVS 18 Dec '02

18 Dec '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv32645/libmpcodecs Modified Files: ve_lavc.c Log Message: mb qp limits Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ve_lavc.c 9 Dec 2002 12:36:04 -0000 1.46 +++ ve_lavc.c 18 Dec 2002 10:51:10 -0000 1.47 @@ -62,6 +62,8 @@ static int lavc_param_vqscale = 0; static int lavc_param_vqmin = 2; static int lavc_param_vqmax = 31; +static int lavc_param_mb_qmin = 2; +static int lavc_param_mb_qmax = 31; static int lavc_param_vqdiff = 3; static float lavc_param_vqcompress = 0.5; static float lavc_param_vqblur = 0.5; @@ -119,6 +121,8 @@ {"vqscale", &lavc_param_vqscale, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, + {"mbqmin", &lavc_param_mb_qmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, + {"mbqmax", &lavc_param_mb_qmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, {"vqcomp", &lavc_param_vqcompress, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, {"vqblur", &lavc_param_vqblur, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, @@ -208,6 +212,10 @@ lavc_venc_context->frame_rate = (float)mux_v->h.dwRate/mux_v->h.dwScale * FRAME_RATE_BASE; lavc_venc_context->qmin= lavc_param_vqmin; lavc_venc_context->qmax= lavc_param_vqmax; +#if LIBAVCODEC_BUILD >= 4646 + lavc_venc_context->mb_qmin= lavc_param_mb_qmin; + lavc_venc_context->mb_qmax= lavc_param_mb_qmax; +#endif lavc_venc_context->max_qdiff= lavc_param_vqdiff; lavc_venc_context->qcompress= lavc_param_vqcompress; lavc_venc_context->qblur= lavc_param_vqblur;

1 0