diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-03-22 01:06:57 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-03-22 01:06:57 +0000 |
| commit | d9526386990bccd61d8773e993e47fceb55b0174 (patch) | |
| tree | ec1e3ead18f9261a01589001e89072546d33ede9 /libavformat | |
| parent | 4edfceccec5a4f5f62415904dd008a2ab23f5d83 (diff) | |
| download | ffmpeg-d9526386990bccd61d8773e993e47fceb55b0174.tar.gz | |
typo: occured --> occurred
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | libavformat/os_support.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 56696eba78..76c1578ba7 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -235,7 +235,7 @@ typedef struct AVInputFormat { 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 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt); * @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 --git a/libavformat/mov.c b/libavformat/mov.c index 9d3431689c..92957a5100 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -155,7 +155,7 @@ typedef struct MOVContext { /* 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 --git a/libavformat/os_support.h b/libavformat/os_support.h index de29a18527..34970e3952 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -69,7 +69,7 @@ typedef unsigned long nfds_t; struct pollfd { int fd; short events; /* events to look for */ - short revents; /* events that occured */ + short revents; /* events that occurred */ }; /* events & revents */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 4620e2cbaf..d85090cfca 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2484,7 +2484,7 @@ int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, AVPacket *pk * @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) |