[SCM] libav/experimental: typos/grammar
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:58:36 UTC 2013
The following commit has been merged in the experimental branch:
commit e42dba481f6e552539ed8ce1a164024f68667943
Author: Diego Biurrun <diego at biurrun.de>
Date: Sat Apr 7 14:09:20 2007 +0000
typos/grammar
Originally committed as revision 8641 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 1884270..e584774 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -873,7 +873,7 @@ void free_vlc(VLC *vlc);
* parses a vlc code, faster then get_vlc()
* @param bits is the number of bits which will be read at once, must be
* 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
* = (max_vlc_length + bits - 1) / bits
*/
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 085e18a..e4e3234 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -8133,7 +8133,7 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
} else {
// start code prefix search
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)
break;
}
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index c0fa7e4..d880955 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1287,7 +1287,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
}else{
assert(mb_type & MB_TYPE_L0L1);
//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)
motion_type = MT_FRAME;
else{
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 80e0f90..8b230a7 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -381,7 +381,7 @@ typedef struct MpegEncContext {
MotionEstContext me;
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
when set to 2 idct/dequant will be skipped too */
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index f3e7ee3..d5b1bf1 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -230,7 +230,7 @@ int ff_combine_frame(ParseContext *pc, int next, uint8_t **buf, int *buf_size)
}
#endif
- /* copy overreaded bytes from last frame into buffer */
+ /* Copy overread bytes from last frame into buffer. */
for(; pc->overread>0; pc->overread--){
pc->buffer[pc->index++]= pc->buffer[pc->overread_index++];
}
diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 3496b34..9452a09 100644
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -31,7 +31,7 @@ typedef struct ParseContext{
uint32_t state; ///< contains the last few bytes in MSB order
int frame_start_found;
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;
struct MpegEncContext;
diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c
index 3822cb2..0a789d1 100644
--- a/libavcodec/ppc/mpegvideo_altivec.c
+++ b/libavcodec/ppc/mpegvideo_altivec.c
@@ -515,7 +515,7 @@ POWERPC_PERF_START_COUNT(altivec_dct_unquantize_h263_num, 1);
}else
qadd = 0;
i = 1;
- nCoeffs= 63; //does not allways use zigzag table
+ nCoeffs= 63; //does not always use zigzag table
} else {
i = 0;
nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ];
diff --git a/libavcodec/ps2/mpegvideo_mmi.c b/libavcodec/ps2/mpegvideo_mmi.c
index 1e5f08a..c21fe7d 100644
--- a/libavcodec/ps2/mpegvideo_mmi.c
+++ b/libavcodec/ps2/mpegvideo_mmi.c
@@ -45,7 +45,7 @@ static void dct_unquantize_h263_mmi(MpegEncContext *s,
qadd = 0;
level = block[0];
}
- nCoeffs= 63; //does not allways use zigzag table
+ nCoeffs= 63; //does not always use zigzag table
} else {
nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ];
}
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 6d9270d..41bf8db 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -31,7 +31,7 @@
#include "mpegvideo.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>
#ifndef M_E
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index eb8c4e1..1d811f3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -204,7 +204,7 @@ typedef struct AVInputFormat {
int (*read_probe)(AVProbeData *);
/** read the format header and initialize the AVFormatContext
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. */
int (*read_header)(struct AVFormatContext *,
AVFormatParameters *ap);
@@ -526,7 +526,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
* @param filename filename to open.
* @param fmt if non NULL, force the file format to use
* @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.
*/
int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
diff --git a/libavformat/http.c b/libavformat/http.c
index e057d6e..b28a56f 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -24,8 +24,8 @@
#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
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 7a68ea9..5580086 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -89,7 +89,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* FIXME Add sanity check here */
- /* first packet is allways audio*/
+ /* first packet is always audio*/
mtv->audio_packet_count = 1;
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index f084130..730c58b2 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -3415,7 +3415,7 @@ static void RENAME(postProcess)(uint8_t src[], int srcStride, uint8_t dst[], int
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);
clipped= sum;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list