Mercurial > libavformat.hg
changeset 3175:55ce214a13ea libavformat
typo: occured --> occurred
| author | diego |
|---|---|
| date | Sat, 22 Mar 2008 01:06:57 +0000 |
| parents | e5c7e9eac774 |
| children | cf8bea8bc156 |
| files | avformat.h mov.c os_support.h utils.c |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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 {
--- 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 */
--- 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)