Commit d9526386 authored by Diego Biurrun's avatar Diego Biurrun

typo: occured --> occurred

Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4edfcecc
......@@ -159,12 +159,12 @@ void print_error(const char *filename, int err)
fprintf(stderr, "%s: Unknown format\n", filename);
break;
case AVERROR(EIO):
fprintf(stderr, "%s: I/O error occured\n"
fprintf(stderr, "%s: I/O error occurred\n"
"Usually that means that input file is truncated and/or corrupted.\n",
filename);
break;
case AVERROR(ENOMEM):
fprintf(stderr, "%s: memory allocation error occured\n", filename);
fprintf(stderr, "%s: memory allocation error occurred\n", filename);
break;
case AVERROR(ENOENT):
fprintf(stderr, "%s: no such file or directory\n", filename);
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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)
......
......@@ -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)
......
......@@ -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;
......
......@@ -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)
......
......@@ -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;
......
......@@ -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);
......
......@@ -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 {
......
......@@ -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 */
......
......@@ -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)
......
......@@ -66,7 +66,7 @@ void pp_postprocess(const uint8_t * src[3], const int srcStride[3],
/**
* returns a pp_mode_t or NULL if an error occured
* returns a pp_mode_t or NULL if an error occurred
* name is the string after "-pp" on the command line
* quality is a number from 0 to PP_QUALITY_MAX
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment