Originally committed as revision 8641 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -873,7 +873,7 @@ void free_vlc(VLC *vlc); | |||||
* parses a vlc code, faster then get_vlc() | * parses a vlc code, faster then get_vlc() | ||||
* @param bits is the number of bits which will be read at once, must be | * @param bits is the number of bits which will be read at once, must be | ||||
* identical to nb_bits in init_vlc() | * identical to nb_bits in init_vlc() | ||||
* @param max_depth is the number of times bits bits must be readed to completly | |||||
* @param max_depth is the number of times bits bits must be read to completely | |||||
* read the longest vlc code | * read the longest vlc code | ||||
* = (max_vlc_length + bits - 1) / bits | * = (max_vlc_length + bits - 1) / bits | ||||
*/ | */ | ||||
@@ -8133,7 +8133,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){ | |||||
} else { | } else { | ||||
// start code prefix search | // start code prefix search | ||||
for(; buf_index + 3 < buf_size; buf_index++){ | for(; buf_index + 3 < buf_size; buf_index++){ | ||||
// this should allways succeed in the first iteration | |||||
// This should always succeed in the first iteration. | |||||
if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | if(buf[buf_index] == 0 && buf[buf_index+1] == 0 && buf[buf_index+2] == 1) | ||||
break; | break; | ||||
} | } | ||||
@@ -1287,7 +1287,7 @@ static int mpeg_decode_mb(MpegEncContext *s, | |||||
}else{ | }else{ | ||||
assert(mb_type & MB_TYPE_L0L1); | assert(mb_type & MB_TYPE_L0L1); | ||||
//FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED | //FIXME decide if MBs in field pictures are MB_TYPE_INTERLACED | ||||
/* get additionnal motion vector type */ | |||||
/* get additional motion vector type */ | |||||
if (s->frame_pred_frame_dct) | if (s->frame_pred_frame_dct) | ||||
motion_type = MT_FRAME; | motion_type = MT_FRAME; | ||||
else{ | else{ | ||||
@@ -381,7 +381,7 @@ typedef struct MpegEncContext { | |||||
MotionEstContext me; | MotionEstContext me; | ||||
int no_rounding; /**< apply no rounding to motion compensation (MPEG4, msmpeg4, ...) | int no_rounding; /**< apply no rounding to motion compensation (MPEG4, msmpeg4, ...) | ||||
for b-frames rounding mode is allways 0 */ | |||||
for b-frames rounding mode is always 0 */ | |||||
int hurry_up; /**< when set to 1 during decoding, b frames will be skipped | int hurry_up; /**< when set to 1 during decoding, b frames will be skipped | ||||
when set to 2 idct/dequant will be skipped too */ | when set to 2 idct/dequant will be skipped too */ | ||||
@@ -230,7 +230,7 @@ int ff_combine_frame(ParseContext *pc, int next, uint8_t **buf, int *buf_size) | |||||
} | } | ||||
#endif | #endif | ||||
/* copy overreaded bytes from last frame into buffer */ | |||||
/* Copy overread bytes from last frame into buffer. */ | |||||
for(; pc->overread>0; pc->overread--){ | for(; pc->overread>0; pc->overread--){ | ||||
pc->buffer[pc->index++]= pc->buffer[pc->overread_index++]; | pc->buffer[pc->index++]= pc->buffer[pc->overread_index++]; | ||||
} | } | ||||
@@ -31,7 +31,7 @@ typedef struct ParseContext{ | |||||
uint32_t state; ///< contains the last few bytes in MSB order | uint32_t state; ///< contains the last few bytes in MSB order | ||||
int frame_start_found; | int frame_start_found; | ||||
int overread; ///< the number of bytes which where irreversibly read from the next frame | int overread; ///< the number of bytes which where irreversibly read from the next frame | ||||
int overread_index; ///< the index into ParseContext.buffer of the overreaded bytes | |||||
int overread_index; ///< the index into ParseContext.buffer of the overread bytes | |||||
} ParseContext; | } ParseContext; | ||||
struct MpegEncContext; | struct MpegEncContext; | ||||
@@ -515,7 +515,7 @@ POWERPC_PERF_START_COUNT(altivec_dct_unquantize_h263_num, 1); | |||||
}else | }else | ||||
qadd = 0; | qadd = 0; | ||||
i = 1; | i = 1; | ||||
nCoeffs= 63; //does not allways use zigzag table | |||||
nCoeffs= 63; //does not always use zigzag table | |||||
} else { | } else { | ||||
i = 0; | i = 0; | ||||
nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; | nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; | ||||
@@ -45,7 +45,7 @@ static void dct_unquantize_h263_mmi(MpegEncContext *s, | |||||
qadd = 0; | qadd = 0; | ||||
level = block[0]; | level = block[0]; | ||||
} | } | ||||
nCoeffs= 63; //does not allways use zigzag table | |||||
nCoeffs= 63; //does not always use zigzag table | |||||
} else { | } else { | ||||
nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; | nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; | ||||
} | } | ||||
@@ -31,7 +31,7 @@ | |||||
#include "mpegvideo.h" | #include "mpegvideo.h" | ||||
#include "eval.h" | #include "eval.h" | ||||
#undef NDEBUG // allways check asserts, the speed effect is far too small to disable them | |||||
#undef NDEBUG // Always check asserts, the speed effect is far too small to disable them. | |||||
#include <assert.h> | #include <assert.h> | ||||
#ifndef M_E | #ifndef M_E | ||||
@@ -204,7 +204,7 @@ typedef struct AVInputFormat { | |||||
int (*read_probe)(AVProbeData *); | int (*read_probe)(AVProbeData *); | ||||
/** read the format header and initialize the AVFormatContext | /** read the format header and initialize the AVFormatContext | ||||
structure. Return 0 if OK. 'ap' if non NULL contains | structure. Return 0 if OK. 'ap' if non NULL contains | ||||
additionnal paramters. Only used in raw format right | |||||
additional paramters. Only used in raw format right | |||||
now. 'av_new_stream' should be called to create new streams. */ | now. 'av_new_stream' should be called to create new streams. */ | ||||
int (*read_header)(struct AVFormatContext *, | int (*read_header)(struct AVFormatContext *, | ||||
AVFormatParameters *ap); | AVFormatParameters *ap); | ||||
@@ -526,7 +526,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr, | |||||
* @param filename filename to open. | * @param filename filename to open. | ||||
* @param fmt if non NULL, force the file format to use | * @param fmt if non NULL, force the file format to use | ||||
* @param buf_size optional buffer size (zero if default is OK) | * @param buf_size optional buffer size (zero if default is OK) | ||||
* @param ap additionnal parameters needed when opening the file (NULL if default) | |||||
* @param ap additional parameters needed when opening the file (NULL if default) | |||||
* @return 0 if OK. AVERROR_xxx otherwise. | * @return 0 if OK. AVERROR_xxx otherwise. | ||||
*/ | */ | ||||
int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, | int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, | ||||
@@ -24,8 +24,8 @@ | |||||
#include "base64.h" | #include "base64.h" | ||||
/* XXX: POST protocol is not completly implemented because ffmpeg use | |||||
only a subset of it */ | |||||
/* XXX: POST protocol is not completely implemented because ffmpeg uses | |||||
only a subset of it. */ | |||||
//#define DEBUG | //#define DEBUG | ||||
@@ -89,7 +89,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap) | |||||
/* FIXME Add sanity check here */ | /* FIXME Add sanity check here */ | ||||
/* first packet is allways audio*/ | |||||
/* first packet is always audio*/ | |||||
mtv->audio_packet_count = 1; | mtv->audio_packet_count = 1; | ||||
@@ -3415,7 +3415,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int | |||||
sum+= yHistogram[i]; | sum+= yHistogram[i]; | ||||
} | } | ||||
/* we allways get a completly black picture first */ | |||||
/* We always get a completely black picture first. */ | |||||
maxClipped= (uint64_t)(sum * c.ppMode.maxClippedThreshold); | maxClipped= (uint64_t)(sum * c.ppMode.maxClippedThreshold); | ||||
clipped= sum; | clipped= sum; | ||||