Mercurial > libavcodec.hg
changeset 6524:01647ac078a7 libavcodec
typo: occured --> occurred
| author | diego |
|---|---|
| date | Sat, 22 Mar 2008 01:06:57 +0000 |
| parents | ae19192241c4 |
| children | 52925923273f |
| files | error_resilience.c flashsv.c h261dec.c h263.c h264.c h264enc.c resample2.c |
| diffstat | 7 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/error_resilience.c Fri Mar 21 13:45:55 2008 +0000 +++ b/error_resilience.c Sat Mar 22 01:06:57 2008 +0000 @@ -613,7 +613,7 @@ * 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);
--- a/flashsv.c Fri Mar 21 13:45:55 2008 +0000 +++ b/flashsv.c Sat Mar 22 01:06:57 2008 +0000 @@ -200,7 +200,7 @@ 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); }
--- a/h261dec.c Fri Mar 21 13:45:55 2008 +0000 +++ b/h261dec.c Sat Mar 22 01:06:57 2008 +0000 @@ -97,7 +97,7 @@ /** * 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 @@ /** * 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)
--- a/h263.c Fri Mar 21 13:45:55 2008 +0000 +++ b/h263.c Sat Mar 22 01:06:57 2008 +0000 @@ -2989,7 +2989,7 @@ /** * 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 @@ /** * 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 @@ /** * 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 @@ /** * 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 @@ /** * 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)
--- a/h264.c Fri Mar 21 13:45:55 2008 +0000 +++ b/h264.c Sat Mar 22 01:06:57 2008 +0000 @@ -3857,7 +3857,7 @@ * @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 @@ * @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;
--- a/h264enc.c Fri Mar 21 13:45:55 2008 +0000 +++ b/h264enc.c Sat Mar 22 01:06:57 2008 +0000 @@ -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)
--- a/resample2.c Fri Mar 21 13:45:55 2008 +0000 +++ b/resample2.c Sat Mar 22 01:06:57 2008 +0000 @@ -208,7 +208,7 @@ /** * 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 @@ * @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;