diff options
| -rw-r--r-- | DOCS/tech/playtree | 2 | ||||
| -rw-r--r-- | drivers/tdfx_vid.c | 6 | ||||
| -rw-r--r-- | liba52/bitstream.h | 2 | ||||
| -rw-r--r-- | liba52/liba52_changes.diff | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_ogg.c | 2 | ||||
| -rw-r--r-- | libvo/vo_tdfx_vid.c | 2 | ||||
| -rw-r--r-- | libvo/vo_zr.c | 4 | ||||
| -rw-r--r-- | m_struct.c | 2 | ||||
| -rw-r--r-- | stream/stream_ftp.c | 6 |
9 files changed, 14 insertions, 14 deletions
diff --git a/DOCS/tech/playtree b/DOCS/tech/playtree index 0e9a7d3184..d2919ea2b3 100644 --- a/DOCS/tech/playtree +++ b/DOCS/tech/playtree @@ -51,7 +51,7 @@ no need that it's the first one. The same apply when you set the child of a node the child argument can be any entry in a list. To remove an entry from the tree use play_tree_remove. If the second arg (free_it) is true it will also free it, if the entry should be freed and the third -arg is true it will also free the childs. +arg is true it will also free the children. When your tree is ready you can then use play_tree_cleanup to remove all unuseful entries. diff --git a/drivers/tdfx_vid.c b/drivers/tdfx_vid.c index 83f7fb8b29..21c652a9bc 100644 --- a/drivers/tdfx_vid.c +++ b/drivers/tdfx_vid.c @@ -682,8 +682,8 @@ static int tdfx_vid_set_overlay(unsigned long arg) { static int tdfx_vid_overlay_on(void) { uint32_t vidcfg = tdfx_inl(VIDPROCCFG); //return 0; - if(vidcfg & (1<<8)) { // Overlay is alredy on - //printk(KERN_DEBUG "tdfx_vid: Overlay is alredy on\n"); + if(vidcfg & (1<<8)) { // Overlay is already on + //printk(KERN_DEBUG "tdfx_vid: Overlay is already on.\n"); return (-EFAULT); } vidcfg |= (1<<8); @@ -700,7 +700,7 @@ static int tdfx_vid_overlay_off(void) { return 0; } - printk(KERN_DEBUG "tdfx_vid: Overlay is alredy off\n"); + printk(KERN_DEBUG "tdfx_vid: Overlay is already off.\n"); return (-EFAULT); } diff --git a/liba52/bitstream.h b/liba52/bitstream.h index 601ffa6871..071fe72906 100644 --- a/liba52/bitstream.h +++ b/liba52/bitstream.h @@ -42,7 +42,7 @@ // alternative (faster) bitstram reader (reades upto 3 bytes over the end of the input) #define ALT_BITSTREAM_READER -/* used to avoid missaligned exceptions on some archs (alpha, ...) */ +/* used to avoid misaligned exceptions on some archs (alpha, ...) */ #if defined (ARCH_X86) || defined(ARCH_ARMV4L) # define unaligned32(a) (*(uint32_t*)(a)) #else diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff index f5fcb03947..b238d613d0 100644 --- a/liba52/liba52_changes.diff +++ b/liba52/liba52_changes.diff @@ -96,7 +96,7 @@ +// alternative (faster) bitstram reader (reades upto 3 bytes over the end of the input) +#define ALT_BITSTREAM_READER + -+/* used to avoid missaligned exceptions on some archs (alpha, ...) */ ++/* used to avoid misaligned exceptions on some archs (alpha, ...) */ +#if defined (ARCH_X86) || defined(ARCH_ARMV4L) +# define unaligned32(a) (*(uint32_t*)(a)) +#else diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index e2a7aca702..ac97f2e6b1 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -313,7 +313,7 @@ static unsigned char* demux_ogg_read_packet(ogg_stream_t* os,ogg_packet* pack,vo // Calculate the timestamp if(pack->granulepos == -1) pack->granulepos = os->lastpos + (os->lastsize ? os->lastsize : 1); - // If we alredy have a timestamp it can be a syncpoint + // If we already have a timestamp it can be a syncpoint if(*pack->packet & PACKET_IS_SYNCPOINT) *flags = 1; *pts = pack->granulepos/os->samplerate; diff --git a/libvo/vo_tdfx_vid.c b/libvo/vo_tdfx_vid.c index 01fd3626ca..401a315a15 100644 --- a/libvo/vo_tdfx_vid.c +++ b/libvo/vo_tdfx_vid.c @@ -149,7 +149,7 @@ flip_page(void) printf("Flip\n"); #endif if(use_overlay) { - // TDFX_VID_OVERLAY_ON does nothing if the overlay is alredy on + // TDFX_VID_OVERLAY_ON does nothing if the overlay is already on if(!ioctl(tdfx_fd,TDFX_VID_OVERLAY_ON)) { // X11 killed the overlay :( if(ioctl(tdfx_fd,TDFX_VID_SET_OVERLAY,&tdfx_ov)) mp_msg(MSGT_VO, MSGL_ERR, "tdfx_vid: set_overlay failed\n"); diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index f919ee9227..fa7ae06be4 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -186,12 +186,12 @@ int init_zoran(zr_info_t *zr, int stretchx, int stretchy) { /* center the image, and stretch it as far as possible (try to keep * aspect) and check if it fits */ if (zr->image_width > zr->vc.maxwidth) { - mp_msg(MSGT_VO, MSGL_ERR, "zr: movie to be played is too wide, max width currenty %d\n", zr->vc.maxwidth); + mp_msg(MSGT_VO, MSGL_ERR, "zr: movie to be played is too wide, max width currently %d\n", zr->vc.maxwidth); return 1; } if (zr->image_height > zr->vc.maxheight) { - mp_msg(MSGT_VO, MSGL_ERR, "zr: movie to be played is too high, max height currenty %d\n", zr->vc.maxheight); + mp_msg(MSGT_VO, MSGL_ERR, "zr: movie to be played is too high, max height currently %d\n", zr->vc.maxheight); return 1; } diff --git a/m_struct.c b/m_struct.c index f6b114ec12..347ba11fc2 100644 --- a/m_struct.c +++ b/m_struct.c @@ -34,7 +34,7 @@ m_struct_alloc(m_struct_t* st) { // Check the struct fields for(i = 0 ; st->fields[i].name ; i++) { if(st->fields[i].type->flags & M_OPT_TYPE_INDIRECT) { - mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s->%s: option type with the indirect flag are forbiden\n",st->name,st->fields[i].name); + mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Struct %s->%s: Option types with the indirect flag are forbidden.\n",st->name,st->fields[i].name); return NULL; } } diff --git a/stream/stream_ftp.c b/stream/stream_ftp.c index 3f1830ac35..1f5b038c3d 100644 --- a/stream/stream_ftp.c +++ b/stream/stream_ftp.c @@ -302,10 +302,10 @@ static int seek(stream_t *s,off_t newpos) { return 0; } - // Check to see if the server doesn't alredy terminated the transfert + // Check to see if the server did not already terminate the transfer if(fd_can_read(p->handle, 0)) { if(readresp(p,rsp_txt) != 2) - mp_msg(MSGT_OPEN,MSGL_WARN, "[ftp] Warning the server didn't finished the transfert correctly: %s\n",rsp_txt); + mp_msg(MSGT_OPEN,MSGL_WARN, "[ftp] Warning the server didn't finished the transfer correctly: %s\n",rsp_txt); closesocket(s->fd); s->fd = -1; } @@ -423,7 +423,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) { return STREAM_ERROR; } - // Set the transfert type + // Set the transfer type resp = FtpSendCmd("TYPE I",p,rsp_txt); if(resp != 2) { mp_msg(MSGT_OPEN,MSGL_WARN, "[ftp] command 'TYPE I' failed: %s\n",rsp_txt); |