[MPlayer-dev-eng] [PATCH] add "resample=<rate>" -lameopts option

Fabian Franz FabianFranz at gmx.de
Mon Apr 7 15:37:41 CEST 2003


Am Montag, 7. April 2003 12:18 schrieb matthew green:
> hi folks.
>
>
> i wanted to resample the audio on some videos from 48000 to 44100
> (for a machine that can't play the former.)  i found that mencoder
> wouldn't let me so i decided to add it.
>
> the documentation change is significantly larger than the code
> itself!  i can now do:
>
>         mencoder ... -lameopts preset=standard:resample=44100
>
> which seems to work identically to lame's --resample option.

hm, just spoke to someone in #mplayer and wanted to tell him about this patch, 
and he noticed me that mencoder already has "srate" option, which does 
resample with lame.

So we now have an duplicate ? Sorry, don't have the man page here atm, so I 
can't check. Just wanted to let you know ...

cu

Fabian

>
>
> this is my first mplayer patch.  hope it's OK.  enjoy!
>
>
> .mrg.
>
>
> Index: mencoder.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/mencoder.c,v
> retrieving revision 1.210
> diff -p -r1.210 mencoder.c
> *** mencoder.c	29 Mar 2003 16:47:20 -0000	1.210
> --- mencoder.c	5 Apr 2003 14:05:57 -0000
> *************** int lame_param_mode=-1; // unset
> *** 200,205 ****
> --- 200,206 ----
>   int lame_param_padding=-1; // unset
>   int lame_param_br=-1; // unset
>   int lame_param_ratio=-1; // unset
> + int lame_param_resample=-1; // unset
>   float lame_param_scale=-1; // unset
>   #if HAVE_MP3LAME >= 392
>   int lame_param_fast=0; // unset
> *************** case ACODEC_VBRMP3:
> *** 781,787 ****
>       mux_a->wf->wFormatTag=0x55; // MP3
>       mux_a->wf->nChannels= (lame_param_mode<0) ? sh_audio->channels :
>   	((lame_param_mode==3) ? 1 : 2);
> !     mux_a->wf->nSamplesPerSec=mux_a->h.dwRate;
>       mux_a->wf->nAvgBytesPerSec=192000/8; // FIXME!
>       mux_a->wf->nBlockAlign=(mux_a->h.dwRate<32000)?576:1152; // required
> for l3codeca.acm + WMP 6.4 mux_a->wf->wBitsPerSample=0; //16;
> --- 782,788 ----
>       mux_a->wf->wFormatTag=0x55; // MP3
>       mux_a->wf->nChannels= (lame_param_mode<0) ? sh_audio->channels :
>   	((lame_param_mode==3) ? 1 : 2);
> !     mux_a->wf->nSamplesPerSec= (lame_param_resample>0) ? 
> lame_param_resample : mux_a->h.dwRate; mux_a->wf->nAvgBytesPerSec=192000/8;
> // FIXME!
>       mux_a->wf->nBlockAlign=(mux_a->h.dwRate<32000)?576:1152; // required
> for l3codeca.acm + WMP 6.4 mux_a->wf->wBitsPerSample=0; //16;
> *************** if(lame_param_vbr){  // VBR:
> *** 844,849 ****
> --- 845,851 ----
>   }
>   if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st
>   if(lame_param_ratio>0) lame_set_compression_ratio(lame,lame_param_ratio);
> + if(lame_param_resample>0)
> lame_set_out_samplerate(lame,lame_param_resample); if(lame_param_scale>0) {
>       printf("Setting audio input gain to %f\n", lame_param_scale);
>       lame_set_scale(lame,lame_param_scale);
> Index: cfg-mencoder.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
> retrieving revision 1.66
> diff -p -r1.66 cfg-mencoder.h
> *** cfg-mencoder.h	3 Mar 2003 11:03:17 -0000	1.66
> --- cfg-mencoder.h	5 Apr 2003 14:05:57 -0000
> *************** struct config lameopts_conf[]={
> *** 32,37 ****
> --- 32,38 ----
>   	{"br", &lame_param_br, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
>   	{"ratio", &lame_param_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
>   	{"vol", &lame_param_scale, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10, NULL},
> + 	{"resample", &lame_param_resample, CONF_TYPE_INT, CONF_RANGE, 0, 96000,
> 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},
> Index: DOCS/de/mplayer.1
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/de/mplayer.1,v
> retrieving revision 1.27
> diff -p -r1.27 mplayer.1
> *** DOCS/de/mplayer.1	22 Mar 2003 12:01:47 -0000	1.27
> --- DOCS/de/mplayer.1	5 Apr 2003 14:05:59 -0000
> *************** instane: CBR\-Encodierung, Preset mit de
> *** 2608,2613 ****
> --- 2608,2615 ----
>   <8-320>: ABR\-Encodierung mit der gegebenen Bitrate.
>   .br
>   .REss
> + .IPs resample=<samplerate>
> + resample input to the given rate, in hz.
>   .RE
>
>   .I BEISPIELE:
> Index: DOCS/en/mplayer.1
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/en/mplayer.1,v
> retrieving revision 1.354
> diff -p -r1.354 mplayer.1
> *** DOCS/en/mplayer.1	29 Mar 2003 00:44:45 -0000	1.354
> --- DOCS/en/mplayer.1	5 Apr 2003 14:06:00 -0000
> *************** insane: CBR encoding, highest preset qua
> *** 2707,2712 ****
> --- 2707,2714 ----
>   <8-320>: ABR encoding at average given kbps bitrate.
>   .br
>   .REss
> + .IPs resample=<samplerate>
> + resample input to the given rate, in hz.
>   .RE
>
>   .I EXAMPLE:
> Index: DOCS/fr/mplayer.1
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/fr/mplayer.1,v
> retrieving revision 1.36
> diff -p -r1.36 mplayer.1
> *** DOCS/fr/mplayer.1	28 Mar 2003 21:58:30 -0000	1.36
> --- DOCS/fr/mplayer.1	5 Apr 2003 14:06:02 -0000
> *************** insane: encodage CBR, plus haute qualité
> *** 2768,2773 ****
> --- 2768,2775 ----
>   <8-320>: encodage ABR au bitrate moyen indiqué.
>   .br
>   .REss
> + .IPs resample=<samplerate>
> + resample input to the given rate, in hz.
>   .RE
>
>   .I EXEMPLE:
> Index: DOCS/hu/mplayer.1
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/hu/mplayer.1,v
> retrieving revision 1.70
> diff -p -r1.70 mplayer.1
> *** DOCS/hu/mplayer.1	27 Mar 2003 18:12:22 -0000	1.70
> --- DOCS/hu/mplayer.1	5 Apr 2003 14:06:03 -0000
> *************** insane: CBR encoding, highest preset qua
> *** 2466,2471 ****
> --- 2466,2473 ----
>   <8-320>: ABR encoding at average given kbps bitrate.
>   .br
>   .REss
> + .IPs resample=<samplerate>
> + resample input to the given rate, in hz.
>   .RE
>
>   .I EXAMPLE:
> Index: DOCS/pl/mplayer.1
> ===================================================================
> RCS file: /cvsroot/mplayer/main/DOCS/pl/mplayer.1,v
> retrieving revision 1.20
> diff -p -r1.20 mplayer.1
> *** DOCS/pl/mplayer.1	27 Mar 2003 17:24:01 -0000	1.20
> --- DOCS/pl/mplayer.1	5 Apr 2003 14:06:05 -0000
> *************** insane: kodowanie CBR, wy¿sza jako¶æ, bi
> *** 2675,2680 ****
> --- 2675,2682 ----
>   <8-320>: kodowanie ABR na ¶redniej podanego bitrate'u w kbps.
>   .br
>   .REss
> + .IPs resample=<samplerate>
> + resample input to the given rate, in hz.
>   .RE
>
>   .I PRZYK£AD:
> Index: help/help_mp-cz.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-cz.h,v
> retrieving revision 1.36
> diff -p -r1.36 help_mp-cz.h
> *** help/help_mp-cz.h	23 Mar 2003 22:09:34 -0000	1.36
> --- help/help_mp-cz.h	5 Apr 2003 14:06:06 -0000
> *************** static char help_text[]=
> *** 229,236 ****
>   "                 (bitový tok 200-240 kbps)\n"\
>   "                 insane: kódování metodou CBR, nevy¹¹í pøednastavená
> kvalita\n"\ "                 (bitový tok 320 kbps)\n"\
> ! "                 <8-320>: hodnota bitového toku pro metodu ABR.\n\n"
> !
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM zaøízení '%s' nenalezeno!\n"
> --- 229,236 ----
>   "                 (bitový tok 200-240 kbps)\n"\
>   "                 insane: kódování metodou CBR, nevy¹¹í pøednastavená
> kvalita\n"\ "                 (bitový tok 320 kbps)\n"\
> ! "                 <8-320>: hodnota bitového toku pro metodu ABR.\n"\
> ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM zaøízení '%s' nenalezeno!\n"
> Index: help/help_mp-de.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-de.h,v
> retrieving revision 1.65
> diff -p -r1.65 help_mp-de.h
> *** help/help_mp-de.h	3 Feb 2003 22:39:01 -0000	1.65
> --- help/help_mp-de.h	5 Apr 2003 14:06:06 -0000
> *************** static char help_text[]=
> *** 231,237 ****
>   "                 insane:  CBR-Encodierung, bestes Preset\n"\
>   "                 (320 kbps Bitrate)\n"\
>   "                 <8-320>: ABR-Encodierung mit der angegebenen
> durchschnittlichen\n"\ ! "                          Bitrate\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM-Gerät '%s' nicht gefunden.\n"
> --- 231,238 ----
>   "                 insane:  CBR-Encodierung, bestes Preset\n"\
>   "                 (320 kbps Bitrate)\n"\
>   "                 <8-320>: ABR-Encodierung mit der angegebenen
> durchschnittlichen\n"\ ! "                          Bitrate\n"\
> ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM-Gerät '%s' nicht gefunden.\n"
> Index: help/help_mp-dk.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-dk.h,v
> retrieving revision 1.20
> diff -p -r1.20 help_mp-dk.h
> *** help/help_mp-dk.h	23 Mar 2003 23:10:41 -0000	1.20
> --- help/help_mp-dk.h	5 Apr 2003 14:06:07 -0000
> *************** static char help_text[]=
> *** 224,230 ****
>   "                 (200-240 kbps bitrate interval)\n"\
>   "                 insane:  CBR  enkodning, højeste præsets kvalitet\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ABR enkodning ved middel kbps bitrate.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM Drev '%s' ikke fundet!\n"
> --- 224,231 ----
>   "                 (200-240 kbps bitrate interval)\n"\
>   "                 insane:  CBR  enkodning, højeste præsets kvalitet\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ABR enkodning ved middel kbps bitrate.\n"\
> ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM Drev '%s' ikke fundet!\n"
> Index: help/help_mp-en.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-en.h,v
> retrieving revision 1.96
> diff -p -r1.96 help_mp-en.h
> *** help/help_mp-en.h	29 Mar 2003 20:11:45 -0000	1.96
> --- help/help_mp-en.h	5 Apr 2003 14:06:07 -0000
> *************** static char help_text[]=
> *** 236,242 ****
>   "                 (200-240 kbps bitrate range)\n"\
>   "                 insane:  CBR  encoding, highest preset quality\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ABR encoding at average given kbps
> bitrate.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM Device '%s' not found.\n"
> --- 236,243 ----
>   "                 (200-240 kbps bitrate range)\n"\
>   "                 insane:  CBR  encoding, highest preset quality\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ABR encoding at average given kbps
> bitrate.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM Device '%s' not found.\n"
> Index: help/help_mp-es.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-es.h,v
> retrieving revision 1.21
> diff -p -r1.21 help_mp-es.h
> *** help/help_mp-es.h	21 Feb 2003 13:07:47 -0000	1.21
> --- help/help_mp-es.h	5 Apr 2003 14:06:08 -0000
> *************** static char help_text[]=
> *** 226,232 ****
>   "                 (rango de 200-240 kbps de tasa de bits)\n"\
>   "                 insane:  codificación CBR, la mejor calidad
> configurable\n"\ "                 (320 kbps de tasa de bits)\n"\
> ! "                 <8-320>: codificación ABR con tasa de bits en promedio
> en los kbps dados.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Dispositivo de CD-ROM '%s' no encontrado.\n"
> --- 226,233 ----
>   "                 (rango de 200-240 kbps de tasa de bits)\n"\
>   "                 insane:  codificación CBR, la mejor calidad
> configurable\n"\ "                 (320 kbps de tasa de bits)\n"\
> ! "                 <8-320>: codificación ABR con tasa de bits en promedio
> en los kbps dados.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Dispositivo de CD-ROM '%s' no encontrado.\n"
> Index: help/help_mp-fr.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-fr.h,v
> retrieving revision 1.38
> diff -p -r1.38 help_mp-fr.h
> *** help/help_mp-fr.h	22 Mar 2003 23:49:29 -0000	1.38
> --- help/help_mp-fr.h	5 Apr 2003 14:06:08 -0000
> *************** static char help_text[]=
> *** 232,238 ****
>   "                 (intervalle de bitrate 200-240 kbps)\n"\
>   "                 insane: encodage CBR, plus haute qualité
> préselectionnée\n"\ "                 (bitrate 320 kbps)\n"\
> ! "                 <8-320>: encodage ABR au bitrate moyen indiqué en
> kbps.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Lecteur CD-ROM '%s' non trouvé!\n"
> --- 232,239 ----
>   "                 (intervalle de bitrate 200-240 kbps)\n"\
>   "                 insane: encodage CBR, plus haute qualité
> préselectionnée\n"\ "                 (bitrate 320 kbps)\n"\
> ! "                 <8-320>: encodage ABR au bitrate moyen indiqué en
> kbps.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Lecteur CD-ROM '%s' non trouvé!\n"
> Index: help/help_mp-gr.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-gr.h,v
> retrieving revision 1.11
> diff -p -r1.11 help_mp-gr.h
> *** help/help_mp-gr.h	21 Feb 2003 13:07:47 -0000	1.11
> --- help/help_mp-gr.h	5 Apr 2003 14:06:09 -0000
> *************** static char help_text[]=
> *** 232,238 ****
>   "                 (200-240 kbps åýñïò bitrate)\n"\
>   "                 insane:  CBR  êùäéêïðïßçóç, õøçëüôåñç preset
> ðïéüôçôá\n"\ "                 (320 kbps åýñïò bitrate)\n"\
> ! "                 <8-320>: ABR êùäéêïðïßçóç óôï ìÝóï bitrate ðïõ äþèçêå
> óå kbps.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Ç CD-ROM óõóêåõÞ '%s' äåí âñÝèçêå!\n"
> --- 232,239 ----
>   "                 (200-240 kbps åýñïò bitrate)\n"\
>   "                 insane:  CBR  êùäéêïðïßçóç, õøçëüôåñç preset
> ðïéüôçôá\n"\ "                 (320 kbps åýñïò bitrate)\n"\
> ! "                 <8-320>: ABR êùäéêïðïßçóç óôï ìÝóï bitrate ðïõ äþèçêå
> óå kbps.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Ç CD-ROM óõóêåõÞ '%s' äåí âñÝèçêå!\n"
> Index: help/help_mp-it.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-it.h,v
> retrieving revision 1.21
> diff -p -r1.21 help_mp-it.h
> *** help/help_mp-it.h	21 Feb 2003 13:07:47 -0000	1.21
> --- help/help_mp-it.h	5 Apr 2003 14:06:09 -0000
> *************** static char help_text[]=
> *** 230,236 ****
>   "                 (intervallo bitrate 200-240 kbps)\n"\
>   "                 insane:  codifica CBR, massima qualità via preset\n"\
>   "                 (bitrate 320 kbps)\n"\
> ! "                 <8-320>: codifica ABR con bitrate medio impostato in
> kbps.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Dispositivo CD-ROM '%s' non trovato!\n"
> --- 230,237 ----
>   "                 (intervallo bitrate 200-240 kbps)\n"\
>   "                 insane:  codifica CBR, massima qualità via preset\n"\
>   "                 (bitrate 320 kbps)\n"\
> ! "                 <8-320>: codifica ABR con bitrate medio impostato in
> kbps.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Dispositivo CD-ROM '%s' non trovato!\n"
> Index: help/help_mp-ko.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-ko.h,v
> retrieving revision 1.13
> diff -p -r1.13 help_mp-ko.h
> *** help/help_mp-ko.h	21 Feb 2003 13:07:47 -0000	1.13
> --- help/help_mp-ko.h	5 Apr 2003 14:06:10 -0000
> *************** static char help_text[]=
> *** 567,573 ****
>   "                 (200-240 kbps ºñÆ®·¹ÀÌÆ® ¹üÀ§)\n"\
>   "                 insane:  CBR  ÀÎÄÚµù, °¡Àå ³ôÀº ÀœÁú\n"\
>   "                 (320 kbps ºñÆ®·¹ÀÌÆ® °íÁ€)\n"\
> ! "                 <8-320>: ÁÖŸîÁø kbps ºñÆ®·¹ÀÌÆ®ÀÇ Æò±ÕÄ¡·Î ABR
> ÀÎÄÚµù.\n\n" #define MSGTR_LeaveTelecineMode "\ndemux_mpg: Progressive
> œÃÄöœº °šÁö, 3:2 TELECINE žðµåžŠ ÁŸ·áÇÕŽÏŽÙ.\n" #define
> MSGTR_EnterTelecineMode "\ndemux_mpg: 3:2 TELECINE °šÁö. ¿ªÀüµÈ telecine
> fxžŠ »ç¿ëÇÕŽÏŽÙ. FPS°¡ %5.3f·Î º¯ÇÔ!\n" #define MSGTR_SDLPreferences "SDL
> µå¶óÀ̹ö Œ³Á€"
> --- 567,575 ----
>   "                 (200-240 kbps ºñÆ®·¹ÀÌÆ® ¹üÀ§)\n"\
>   "                 insane:  CBR  ÀÎÄÚµù, °¡Àå ³ôÀº ÀœÁú\n"\
>   "                 (320 kbps ºñÆ®·¹ÀÌÆ® °íÁ€)\n"\
> ! "                 <8-320>: ÁÖŸîÁø kbps ºñÆ®·¹ÀÌÆ®ÀÇ Æò±ÕÄ¡·Î ABR
> ÀÎÄÚµù.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
> !
>   #define MSGTR_LeaveTelecineMode "\ndemux_mpg: Progressive œÃÄöœº °šÁö,
> 3:2 TELECINE žðµåžŠ ÁŸ·áÇÕŽÏŽÙ.\n" #define MSGTR_EnterTelecineMode
> "\ndemux_mpg: 3:2 TELECINE °šÁö. ¿ªÀüµÈ telecine fxžŠ »ç¿ëÇÕŽÏŽÙ. FPS°¡
> %5.3f·Î º¯ÇÔ!\n" #define MSGTR_SDLPreferences "SDL µå¶óÀ̹ö Œ³Á€"
> Index: help/help_mp-nl.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-nl.h,v
> retrieving revision 1.23
> diff -p -r1.23 help_mp-nl.h
> *** help/help_mp-nl.h	21 Feb 2003 13:07:47 -0000	1.23
> --- help/help_mp-nl.h	5 Apr 2003 14:06:10 -0000
> *************** static char help_text[]=
> *** 227,233 ****
>   "                 (200-240 kbps bitrate range)\n"\
>   "                 insane:  CBR  encodering, hoogste preset qualiteit\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ABR encodering aan de opgegeven gemiddelde
> bitrate in kbps.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM Device '%s' niet gevonden!\n"
> --- 227,234 ----
>   "                 (200-240 kbps bitrate range)\n"\
>   "                 insane:  CBR  encodering, hoogste preset qualiteit\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ABR encodering aan de opgegeven gemiddelde
> bitrate in kbps.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM Device '%s' niet gevonden!\n"
> Index: help/help_mp-pl.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-pl.h,v
> retrieving revision 1.66
> diff -p -r1.66 help_mp-pl.h
> *** help/help_mp-pl.h	29 Mar 2003 18:58:08 -0000	1.66
> --- help/help_mp-pl.h	5 Apr 2003 14:06:10 -0000
> *************** static char help_text[]=
> *** 236,242 ****
>   "                 (bitrate w zakresie 200-240 kbps)\n"\
>   "                 insane: kodowanie CBR, najwy¿sza mo¿liwa jako¶æ\n"\
>   "                 (bitrate 320 kbps)\n"\
> ! "                 <8-320>: kodowanie ABR przy podanym ¶rednim
> bitrate.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Urz±dzenie CD-ROM '%s' nie znalezione.\n"
> --- 236,243 ----
>   "                 (bitrate w zakresie 200-240 kbps)\n"\
>   "                 insane: kodowanie CBR, najwy¿sza mo¿liwa jako¶æ\n"\
>   "                 (bitrate 320 kbps)\n"\
> ! "                 <8-320>: kodowanie ABR przy podanym ¶rednim
> bitrate.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Urz±dzenie CD-ROM '%s' nie znalezione.\n"
> Index: help/help_mp-pt_BR.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-pt_BR.h,v
> retrieving revision 1.12
> diff -p -r1.12 help_mp-pt_BR.h
> *** help/help_mp-pt_BR.h	21 Feb 2003 13:07:47 -0000	1.12
> --- help/help_mp-pt_BR.h	5 Apr 2003 14:06:11 -0000
> *************** static char help_text[]=
> *** 241,247 ****
>   "                 (taxa de bits entre 200-240 kbps)\n"\
>   "                 insane:  codificação CBR, ajuste para a mais alta
> qualidade\n"\ "                 (taxa de bits fixa em 320 kbps)\n"\
> ! "                 <8-320>: codificação ABR com a taxa de bits em kbps
> dada.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Dispositivo de CD-ROM '%s' não
> encontrado!\n" --- 241,248 ----
>   "                 (taxa de bits entre 200-240 kbps)\n"\
>   "                 insane:  codificação CBR, ajuste para a mais alta
> qualidade\n"\ "                 (taxa de bits fixa em 320 kbps)\n"\
> ! "                 <8-320>: codificação ABR com a taxa de bits em kbps
> dada.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "Dispositivo de CD-ROM '%s' não
> encontrado!\n" Index: help/help_mp-ru.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-ru.h,v
> retrieving revision 1.20
> diff -p -r1.20 help_mp-ru.h
> *** help/help_mp-ru.h	21 Mar 2003 10:41:27 -0000	1.20
> --- help/help_mp-ru.h	5 Apr 2003 14:06:11 -0000
> *************** static char help_text[]=
> *** 228,234 ****
>   "                 (ÁÍÐÌÉÔÕÄÁ ÂÉÔÐÏÔÏËÁ - 200-240 kbps)\n"\
>   "                 insane:  CBR ËÏÄÉÒÏ×ÁÎÉÅ, ÌÕÞÛÅÅ ÐÒÅÄÕÓÔÁÎÏ×ÌÅÎÎÏÅ
> ËÁÞÅÓÔ×Ï\n"\ "                 (ÂÉÔÐÏÔÏË 320 kbps)\n"\
> ! "                 <8-320>: ABR ËÏÄÉÒÏ×ÁÎÉÅ Ó ÚÁÄÁÎÎÙÍ × kbit'ÁÈ ÓÒÅÄÎÉÍ
> ÂÉÔÐÏÔÏËÏÍ.\n\n"
>
>
>
> --- 228,235 ----
>   "                 (ÁÍÐÌÉÔÕÄÁ ÂÉÔÐÏÔÏËÁ - 200-240 kbps)\n"\
>   "                 insane:  CBR ËÏÄÉÒÏ×ÁÎÉÅ, ÌÕÞÛÅÅ ÐÒÅÄÕÓÔÁÎÏ×ÌÅÎÎÏÅ
> ËÁÞÅÓÔ×Ï\n"\ "                 (ÂÉÔÐÏÔÏË 320 kbps)\n"\
> ! "                 <8-320>: ABR ËÏÄÉÒÏ×ÁÎÉÅ Ó ÚÁÄÁÎÎÙÍ × kbit'ÁÈ ÓÒÅÄÎÉÍ
> ÂÉÔÐÏÔÏËÏÍ.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>
>
> Index: help/help_mp-sk.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-sk.h,v
> retrieving revision 1.12
> diff -p -r1.12 help_mp-sk.h
> *** help/help_mp-sk.h	21 Feb 2003 13:07:47 -0000	1.12
> --- help/help_mp-sk.h	5 Apr 2003 14:06:12 -0000
> *************** static char help_text[]=
> *** 225,231 ****
>   "                 (200-240 kbps rozp„tie bit. rìchlosti)\n"\
>   "                 insane:  CBR  k¢dovanie, najvyççie nastavenie
> kvality\n"\ "                 (320 kbps bit. rìchlosœ)\n"\
> ! "                 <8-320>: ABR k¢dovanie na zadanej kbps bit.
> rìchlosti.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM zariadenie '%s' nen jden‚!\n"
> --- 225,232 ----
>   "                 (200-240 kbps rozp„tie bit. rìchlosti)\n"\
>   "                 insane:  CBR  k¢dovanie, najvyççie nastavenie
> kvality\n"\ "                 (320 kbps bit. rìchlosœ)\n"\
> ! "                 <8-320>: ABR k¢dovanie na zadanej kbps bit.
> rìchlosti.\n"\ ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "CD-ROM zariadenie '%s' nen jden‚!\n"
> *************** static char help_text[]=
> *** 598,601 ****
>   #define MSGTR_MSGBOX_LABEL_Error "chyba ..."
>   #define MSGTR_MSGBOX_LABEL_Warning "upozornenie ..."
>
> ! #endif
> \ No newline at end of file
> --- 599,602 ----
>   #define MSGTR_MSGBOX_LABEL_Error "chyba ..."
>   #define MSGTR_MSGBOX_LABEL_Warning "upozornenie ..."
>
> ! #endif
> Index: help/help_mp-zh.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/help/help_mp-zh.h,v
> retrieving revision 1.20
> diff -p -r1.20 help_mp-zh.h
> *** help/help_mp-zh.h	17 Mar 2003 10:01:25 -0000	1.20
> --- help/help_mp-zh.h	5 Apr 2003 14:06:13 -0000
> *************** static char help_text[]=
> *** 227,233 ****
>   "                 (200-240 kbps±ÈÌØÂÊ·¶Î§)\n"\
>   "                 insane:  CBR±àÂ룬ÖÊÁ¿£º×îžß\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ÒÔËùžø±ÈÌØÂÊΪƜŸù±ÈÌØÂʵÄABR±àÂë¡£\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "ÕÒ²»µœCD-ROMÉ豞 '%s' !\n"
> --- 227,234 ----
>   "                 (200-240 kbps±ÈÌØÂÊ·¶Î§)\n"\
>   "                 insane:  CBR±àÂ룬ÖÊÁ¿£º×îžß\n"\
>   "                 (320 kbps bitrate)\n"\
> ! "                 <8-320>: ÒÔËùžø±ÈÌØÂÊΪƜŸù±ÈÌØÂʵÄABR±àÂë¡£\n"\
> ! " resample=<rate> resample audio to rate hz.\n\n"
>
>   // open.c, stream.c:
>   #define MSGTR_CdDevNotfound "ÕÒ²»µœCD-ROMÉ豞 '%s' !\n"
>
> _______________________________________________
> MPlayer-dev-eng mailing list
> MPlayer-dev-eng at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng




More information about the MPlayer-dev-eng mailing list