Mercurial > mplayer.hg
changeset 33487:45e772bf4d6a
Fix typos.
Patch by Mike Castle, dalgoda+mplayer gmail
author | cehoyos |
---|---|
date | Fri, 10 Jun 2011 08:31:00 +0000 |
parents | e46989c7f47e |
children | 4269a13e01cf |
files | libmpdemux/demuxer.c libmpdemux/demuxer.h sub/vobsub.c |
diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Wed Jun 08 18:58:10 2011 +0000 +++ b/libmpdemux/demuxer.c Fri Jun 10 08:31:00 2011 +0000 @@ -627,7 +627,7 @@ // return value: // 0 = EOF // 1 = successful -#define MAX_ACUMULATED_PACKETS 64 +#define MAX_ACCUMULATED_PACKETS 64 int ds_fill_buffer(demux_stream_t *ds) { demuxer_t *demux = ds->demuxer; @@ -656,7 +656,7 @@ if (demux->reference_clock != MP_NOPTS_VALUE) { if ( p->pts != MP_NOPTS_VALUE && p->pts > demux->reference_clock - && ds->packs < MAX_ACUMULATED_PACKETS) { + && ds->packs < MAX_ACCUMULATED_PACKETS) { if (demux_fill_buffer(demux, ds)) continue; } @@ -847,7 +847,7 @@ /** * Get a subtitle packet. In particular avoid reading the stream. * \param pts input: maximum pts value of subtitle packet. NOPTS or NULL for any. - * output: start/referece pts of subtitle + * output: start/reference pts of subtitle * May be NULL. * \param endpts output: pts for end of display time. May be NULL. * \return -1 if no packet is available
--- a/libmpdemux/demuxer.h Wed Jun 08 18:58:10 2011 +0000 +++ b/libmpdemux/demuxer.h Fri Jun 10 08:31:00 2011 +0000 @@ -87,7 +87,7 @@ #define DEMUXER_TYPE_RTP_NEMESI 45 #define DEMUXER_TYPE_MNG 46 -// This should always match the higest demuxer type number. +// This should always match the highest demuxer type number. // Unless you want to disallow users to force the demuxer to some types #define DEMUXER_TYPE_MIN 0 #define DEMUXER_TYPE_MAX 46 @@ -259,7 +259,7 @@ // stream headers: void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t) - void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t) + void* v_streams[MAX_V_STREAMS]; // video streams (sh_video_t) void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag) // pointer to teletext decoder private data, if demuxer stream contains teletext @@ -410,7 +410,7 @@ int ds_parse(demux_stream_t *sh, uint8_t **buffer, int *len, double pts, off_t pos); void ds_clear_parser(demux_stream_t *sh); -// This is defined here because demux_stream_t ins't defined in stream.h +// This is defined here because demux_stream_t isn't defined in stream.h stream_t* new_ds_stream(demux_stream_t *ds); static inline int avi_stream_id(unsigned int id){ @@ -427,7 +427,7 @@ demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd); // AVI demuxer params: -extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index +extern int index_mode; // -1=untouched 0=don't use index 1=use (generate) index extern char *index_file_save, *index_file_load; extern int force_ni; extern int pts_from_bps;
--- a/sub/vobsub.c Wed Jun 08 18:58:10 2011 +0000 +++ b/sub/vobsub.c Fri Jun 10 08:31:00 2011 +0000 @@ -1338,7 +1338,7 @@ m = s / 60; s -= m * 60; ms = (s - (unsigned int) s) * 1000; - if (ms >= 1000) /* prevent overfolws or bad float stuff */ + if (ms >= 1000) /* prevent overflows or bad float stuff */ ms = 0; if (h != last_h || m != last_m || (unsigned int) s != last_s || ms != last_ms) { fprintf(vob->fidx, "timestamp: %02u:%02u:%02u:%03u, filepos: %09lx\n", @@ -1379,13 +1379,13 @@ datalen += 1; /* AID */ pad_len = 2048 - (p - buffer) - 4 /* MPEG ID */ - 2 /* payload len */ - datalen; /* XXX - Go figure what should go here! In any case the - packet has to be completly filled. If I can fill it + packet has to be completely filled. If I can fill it with padding (0x000001be) latter I'll do that. But if there is only room for 6 bytes then I can not write a padding packet. So I add some padding in the PTS field. This looks like a dirty kludge. Oh well... */ if (pad_len < 0) { - /* Packet is too big. Let's try ommiting the PTS field */ + /* Packet is too big. Let's try omitting the PTS field */ datalen -= pts_len; pts_len = 0; pad_len = 0; @@ -1436,7 +1436,7 @@ perror("ERROR: vobsub blank padding write failed"); } else if (remain < 0) fprintf(stderr, - "\nERROR: wrong thing happenned...\n" + "\nERROR: wrong thing happened...\n" " I wrote a %i data bytes spu packet and that's too long\n", len); } }