typo: occured --> occurred

Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk

7 files changed, 14 insertions, 14 deletions

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index bbaf2403e4..e51390536a 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -613,7 +613,7 @@ void ff_er_frame_start(MpegEncContext *s){
  * adds a slice.
  * @param endx x component of the last macroblock, can be -1 for the last of the previous line
  * @param status the status at the end (MV_END, AC_ERROR, ...), it is assumed that no earlier end or
- *               error of the same type occured
+ *               error of the same type occurred
  */
 void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int endy, int status){
     const int start_i= av_clip(startx + starty * s->mb_width    , 0, s->mb_num-1);
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index edb44cddcd..28579b79b3 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -200,7 +200,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
                 ret = inflate(&(s->zstream), Z_FINISH);
                 if (ret == Z_DATA_ERROR)
                 {
-                    av_log(avctx, AV_LOG_ERROR, "Zlib resync occured\n");
+                    av_log(avctx, AV_LOG_ERROR, "Zlib resync occurred\n");
                     inflateSync(&(s->zstream));
                     ret = inflate(&(s->zstream), Z_FINISH);
                 }
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 6d960f9149..692da22276 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -97,7 +97,7 @@ static av_cold int h261_decode_init(AVCodecContext *avctx){
 
 /**
  * decodes the group of blocks header or slice header.
- * @return <0 if an error occured
+ * @return <0 if an error occurred
  */
 static int h261_decode_gob_header(H261Context *h){
     unsigned int val;
@@ -352,7 +352,7 @@ intra:
 
 /**
  * decodes a macroblock
- * @return <0 if an error occured
+ * @return <0 if an error occurred
  */
 static int h261_decode_block(H261Context * h, DCTELEM * block,
                              int n, int coded)
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 6a420f9da6..3446204c6f 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -2989,7 +2989,7 @@ void ff_h263_encode_mba(MpegEncContext *s)
 
 /**
  * decodes the group of blocks header or slice header.
- * @return <0 if an error occured
+ * @return <0 if an error occurred
  */
 static int h263_decode_gob_header(MpegEncContext *s)
 {
@@ -3385,7 +3385,7 @@ static inline int get_amv(MpegEncContext *s, int n){
 
 /**
  * decodes first partition.
- * @return number of MBs decoded or <0 if an error occured
+ * @return number of MBs decoded or <0 if an error occurred
  */
 static int mpeg4_decode_partition_a(MpegEncContext *s){
     int mb_num;
@@ -3550,7 +3550,7 @@ try_again:
 
 /**
  * decode second partition.
- * @return <0 if an error occured
+ * @return <0 if an error occurred
  */
 static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count){
     int mb_num=0;
@@ -3690,7 +3690,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s)
 
 /**
  * decode partition C of one MB.
- * @return <0 if an error occured
+ * @return <0 if an error occurred
  */
 static int mpeg4_decode_partitioned_mb(MpegEncContext *s, DCTELEM block[6][64])
 {
@@ -4721,7 +4721,7 @@ static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
 
 /**
  * decodes a block.
- * @return <0 if an error occured
+ * @return <0 if an error occurred
  */
 static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
                               int n, int coded, int intra, int rvlc)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 26bd3b5d4e..46614918c1 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3857,7 +3857,7 @@ static void clone_slice(H264Context *dst, H264Context *src)
  * @param h h264context
  * @param h0 h264 master context (differs from 'h' when doing sliced based parallel decoding)
  *
- * @return 0 if okay, <0 if an error occured, 1 if decoding must not be multithreaded
+ * @return 0 if okay, <0 if an error occurred, 1 if decoding must not be multithreaded
  */
 static int decode_slice_header(H264Context *h, H264Context *h0){
     MpegEncContext * const s = &h->s;
@@ -4290,7 +4290,7 @@ static inline int get_dct8x8_allowed(H264Context *h){
  * @param n block index
  * @param scantable scantable
  * @param max_coeff number of coefficients in the block
- * @return <0 if an error occured
+ * @return <0 if an error occurred
  */
 static int decode_residual(H264Context *h, GetBitContext *gb, DCTELEM *block, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff){
     MpegEncContext * const s = &h->s;
diff --git a/libavcodec/h264enc.c b/libavcodec/h264enc.c
index 15e1823022..542c373248 100644
--- a/libavcodec/h264enc.c
+++ b/libavcodec/h264enc.c
@@ -29,7 +29,7 @@
  * @param dest the target buffer, dst+1 == src is allowed as a special case
  * @param destsize the length of the dst array
  * @param b2 the data which should be escaped
- * @returns pointer to current position in the output buffer or NULL if an error occured
+ * @returns pointer to current position in the output buffer or NULL if an error occurred
  */
 static uint8_t *h264_write_nal_unit(int nal_ref_idc, int nal_unit_type, uint8_t *dest, int *destsize,
                           PutBitContext *b2)
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index da1443d98f..ed59448a49 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -208,7 +208,7 @@ void av_resample_close(AVResampleContext *c){
 
 /**
  * Compensates samplerate/timestamp drift. The compensation is done by changing
- * the resampler parameters, so no audible clicks or similar distortions ocur
+ * the resampler parameters, so no audible clicks or similar distortions occur
  * @param compensation_distance distance in output samples over which the compensation should be performed
  * @param sample_delta number of output samples which should be output less
  *
@@ -231,7 +231,7 @@ void av_resample_compensate(AVResampleContext *c, int sample_delta, int compensa
  * @param src_size the number of unconsumed samples available
  * @param dst_size the amount of space in samples available in dst
  * @param update_ctx if this is 0 then the context wont be modified, that way several channels can be resampled with the same context
- * @return the number of samples written in dst or -1 if an error occured
+ * @return the number of samples written in dst or -1 if an error occurred
  */
 int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx){
     int dst_index, i;