# HG changeset patch # User diego # Date 1206148017 0 # Node ID 55ce214a13ea16ea6262126036147d8a1400be94 # Parent e5c7e9eac774628ee110d44789c30a065851645a typo: occured --> occurred diff -r e5c7e9eac774 -r 55ce214a13ea avformat.h --- a/avformat.h Fri Mar 21 22:17:56 2008 +0000 +++ b/avformat.h Sat Mar 22 01:06:57 2008 +0000 @@ -235,7 +235,7 @@ int stream_index, int64_t timestamp, int flags); /** * gets the next timestamp in stream[stream_index].time_base units. - * @return the timestamp or AV_NOPTS_VALUE if an error occured + * @return the timestamp or AV_NOPTS_VALUE if an error occurred */ int64_t (*read_timestamp)(struct AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); @@ -868,7 +868,7 @@ * @param flush 1 if no further packets are available as input and all * remaining packets should be output * @return 1 if a packet was output, 0 if no packet could be output, - * < 0 if an error occured + * < 0 if an error occurred */ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush); diff -r e5c7e9eac774 -r 55ce214a13ea mov.c --- a/mov.c Fri Mar 21 22:17:56 2008 +0000 +++ b/mov.c Sat Mar 22 01:06:57 2008 +0000 @@ -155,7 +155,7 @@ /* return code: 1: found what I wanted, exit 0: continue to parse next atom - <0: error occured, exit + <0: error occurred, exit */ /* links atom IDs to parse functions */ typedef struct MOVParseTableEntry { diff -r e5c7e9eac774 -r 55ce214a13ea os_support.h --- a/os_support.h Fri Mar 21 22:17:56 2008 +0000 +++ b/os_support.h Sat Mar 22 01:06:57 2008 +0000 @@ -69,7 +69,7 @@ struct pollfd { int fd; short events; /* events to look for */ - short revents; /* events that occured */ + short revents; /* events that occurred */ }; /* events & revents */ diff -r e5c7e9eac774 -r 55ce214a13ea utils.c --- a/utils.c Fri Mar 21 22:17:56 2008 +0000 +++ b/utils.c Sat Mar 22 01:06:57 2008 +0000 @@ -2484,7 +2484,7 @@ * @param flush 1 if no further packets are available as input and all * remaining packets should be output * @return 1 if a packet was output, 0 if no packet could be output, - * < 0 if an error occured + * < 0 if an error occurred */ static int av_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, int flush){ if(s->oformat->interleave_packet)