diff options
| -rw-r--r-- | DOCS/tech/TODO | 2 | ||||
| -rw-r--r-- | DOCS/tech/encoding-tips.txt | 2 | ||||
| -rw-r--r-- | DOCS/tech/hwac3.txt | 2 | ||||
| -rw-r--r-- | DOCS/tech/playtree | 2 | ||||
| -rw-r--r-- | cfg-common.h | 4 | ||||
| -rw-r--r-- | libmpcodecs/ae_lavc.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
| -rw-r--r-- | mp_msg.h | 2 | ||||
| -rw-r--r-- | xvid_vbr.c | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/DOCS/tech/TODO b/DOCS/tech/TODO index fdfec6fb9c..36ddefcf1b 100644 --- a/DOCS/tech/TODO +++ b/DOCS/tech/TODO @@ -16,7 +16,7 @@ CVS CLEANUP work: - bte.diff - something input plugin (uses fork() ) - lavc_statsfile_errorchecking-patch - handle errors writing to logfile - xine-lib-cvs-xvmc.diff - XvMC support for libmpeg2 0.3.x - - fastermemcpy.diff - cacheline-size dependant optimizations + - fastermemcpy.diff - cacheline-size dependent optimizations - fire-x86-runtime-options.diff - en/disable (force) cpu features runtime (needs to be integrated with --runtime-cpu-detection en/disabled modes) - mga_vid_laced.diff - buggy interlace support into mga_vid diff --git a/DOCS/tech/encoding-tips.txt b/DOCS/tech/encoding-tips.txt index 91701d86ea..baf866e715 100644 --- a/DOCS/tech/encoding-tips.txt +++ b/DOCS/tech/encoding-tips.txt @@ -302,7 +302,7 @@ bits (i.e. 900kbps is 900000)) This way it apeared that the minimum bits per block is ~40, very good results are with ~50, and everything above 60 is a waste of bandwidth. -And what's actually funny is that it was independant of codec used. The +And what's actually funny is that it was independent of codec used. The results were exactly the same, whether I used DIV3 (with tricky nandub's magick), ffmpeg odivx, DivX5 on Windows or XviD. diff --git a/DOCS/tech/hwac3.txt b/DOCS/tech/hwac3.txt index e5e42670d4..b3a7e9a757 100644 --- a/DOCS/tech/hwac3.txt +++ b/DOCS/tech/hwac3.txt @@ -137,7 +137,7 @@ options snd-pcm-oss snd_dsp_map=0 snd_adsp_map=2 # do the mapping This works flawlessly in combination with alsa's native SysVrc-init-script 'alsasound'. Be sure to disable any distribution -dependant script (e.g. Mandrake-8.1 has an 'alsa' script which depends +dependent script (e.g. Mandrake-8.1 has an 'alsa' script which depends on ALSA-0.5). Sorry for you *BSD'lers out there. I have no grasp on sound support there. diff --git a/DOCS/tech/playtree b/DOCS/tech/playtree index d6d686291e..0e9a7d3184 100644 --- a/DOCS/tech/playtree +++ b/DOCS/tech/playtree @@ -117,7 +117,7 @@ Ok, that's all for now. To have some exemples look into mplayer.c ;) First just after config parsing, the iterator is created there. Also after stream opening, in case the stream is a playlist it replace the entry which contained the playlist by the result of the parsing. -In the event handeling it check if a step can be done, etc. And finnaly +In the event handling it check if a step can be done, etc. And finnaly at the end it go the next entry. Suggestion, flames, etc about this doc must go to albeu@free.fr diff --git a/cfg-common.h b/cfg-common.h index ab01146d92..e313d62c46 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -649,9 +649,9 @@ m_option_t msgl_config[]={ " mencoder\n" " xacodec - XAnim codecs\n" " tv - TV input subsystem\n" - " osdep - OS Dependant parts (linux/ for now)\n" + " osdep - OS-dependent parts\n" " spudec - spudec.c\n" - " playtree - Playtree handeling (playtree.c, playtreeparser.c)\n" + " playtree - Playtree handling (playtree.c, playtreeparser.c)\n" " input\n" " vfilter\n" " osd\n" diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index a62740f102..d8b0e2c865 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -206,7 +206,7 @@ int mpae_init_lavc(audio_encoder_t *encoder) /* * Special case for adpcm_ima_wav. - * The bitrate is only dependant on samplerate. + * The bitrate is only dependent on samplerate. * We have to known frame_size and block_align in advance, * so I just copied the code from libavcodec/adpcm.c * diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 3998c38cd8..c1c1c085d7 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -197,7 +197,7 @@ void mp_msp_av_log_callback(void* ptr, int level, const char* fmt, va_list vl) if(s->codec->decode) type= MSGT_DECVIDEO; } - //FIXME subtitles, encoders (what msgt for them? there is no appropiate ...) + //FIXME subtitles, encoders (what msgt for them? there is no appropriate ...) } }else if(!strcmp(avc->class_name, "AVFormatContext")){ #if 0 //needs libavformat include FIXME iam too lazy to do this cleanly,probably the whole should be moved out of this file ... @@ -64,7 +64,7 @@ extern int verbose; #define MSGT_TV 24 // TV input subsystem -#define MSGT_OSDEP 25 // OS Dependant parts (linux/ for now) +#define MSGT_OSDEP 25 // OS-dependent parts #define MSGT_SPUDEC 26 // spudec.c diff --git a/xvid_vbr.c b/xvid_vbr.c index d3a7388faa..015a812c71 100644 --- a/xvid_vbr.c +++ b/xvid_vbr.c @@ -1327,7 +1327,7 @@ static int vbr_getquant_2pass2(void *sstate) state->desired_bytes2 = bytes2; - /* Ugly dependance between getquant and getintra */ + /* Ugly dependence between getquant and getintra */ intra = state->getintra(state); if(intra) { |