fix various typos

Lou Logan committed 12 years ago

Commit 88f25861 parent 137c5e130 files · +40 −40Browse files

Unified · Split

30 files

Changelog +3 −3
doc/codecs.texi +1 −1
doc/encoders.texi +1 −1
doc/examples/decoding_encoding.c +1 −1
doc/faq.texi +1 −1
doc/muxers.texi +1 −1
ffmpeg.c +1 −1
libavcodec/aacdec.c +1 −1
libavcodec/avcodec.h +2 −2
libavcodec/dcadec.c +1 −1
libavcodec/dcaenc.c +1 −1
libavcodec/diracdec.c +2 −2
libavcodec/indeo5.c +1 −1
libavcodec/jpeg2000.c +1 −1
libavdevice/opengl_enc.c +5 −5
libavfilter/buffersrc.h +1 −1
libavfilter/libmpcodecs/vf.h +1 −1
libavfilter/libmpcodecs/vf_fspp.c +1 −1
libavfilter/vf_mp.c +1 −1
libavfilter/vf_smartblur.c +3 −3
libavformat/avio_internal.h +1 −1
libavformat/brstm.c +1 −1
libavformat/ffmdec.c +1 −1
libavformat/hevc.c +1 −1
libavformat/mpeg.c +1 −1
libavutil/bprint.c +1 −1
libavutil/mathematics.h +1 −1
libavutil/pixdesc.h +1 −1
libswresample/swresample-test.c +1 −1
tools/patcheck +1 −1

@@ -9,10 +9,10 @@ version <next>: · 8 unmodified lines
9	9	- replaygain data export
10	10	- VP7 video decoder
11	11	- Alias PIX image encoder and decoder
12		−- Improvments to the BRender PIX image decoder
13		−- Improvments to the XBM decoder
	12	+- Improvements to the BRender PIX image decoder
	13	+- Improvements to the XBM decoder
14	14	- QTKit input device
15		−- improvments to OpenEXR image decoder
	15	+- improvements to OpenEXR image decoder
16	16	- support decoding 16-bit RLE SGI images
17	17	- GDI screen grabbing for Windows
18	18	- alternative rendition support for HTTP Live Streaming

doc/codecs.texi+1−1

@@ -886,7 +886,7 @@ Set frame skip factor. · 885 unmodified lines
886	886	Set frame skip exponent.
887	887	Negative values behave identical to the corresponding positive ones, except
888	888	that the score is normalized.
889		−Positive values exist primarly for compatibility reasons and are not so useful.
	889	+Positive values exist primarily for compatibility reasons and are not so useful.
890	890
891	891	@item skipcmp @var{integer} (@emph{encoding,video})
892	892	Set frame skip compare function.

doc/encoders.texi+1−1

@@ -80,7 +80,7 @@ thresholds with quantizer steps to find the appropriate quantization with · 79 unmodified lines
80	80	distortion below threshold band by band.
81	81
82	82	The quality of this method is comparable to the two loop searching method
83		−descibed below, but somewhat a little better and slower.
	83	+described below, but somewhat a little better and slower.
84	84
85	85	@item anmr
86	86	Average noise to mask ratio (ANMR) trellis-based solution.

doc/examples/decoding_encoding.c+1−1

@@ -640,7 +640,7 @@ int main(int argc, char **argv) · 639 unmodified lines
640	640	"This program generates a synthetic stream and encodes it to a file\n"
641	641	"named test.h264, test.mp2 or test.mpg depending on output_type.\n"
642	642	"The encoded stream is then decoded and written to a raw data output.\n"
643		− "output_type must be choosen between 'h264', 'mp2', 'mpg'.\n",
	643	+ "output_type must be chosen between 'h264', 'mp2', 'mpg'.\n",
644	644	argv[0]);
645	645	return 1;
646	646	}

doc/faq.texi+1−1

@@ -392,7 +392,7 @@ VOB and a few other formats do not have a global header that describes · 391 unmodified lines
392	392	everything present in the file. Instead, applications are supposed to scan
393	393	the file to see what it contains. Since VOB files are frequently large, only
394	394	the beginning is scanned. If the subtitles happen only later in the file,
395		−they will not be initally detected.
	395	+they will not be initially detected.
396	396
397	397	Some applications, including the @code{ffmpeg} command-line tool, can only
398	398	work with streams that were detected during the initial scan; streams that

doc/muxers.texi+1−1

@@ -714,7 +714,7 @@ Change the syncpoint usage in nut: · 713 unmodified lines
714	714	@table @option
715	715	@item @var{default} use the normal low-overhead seeking aids.
716	716	@item @var{none} do not use the syncpoints at all, reducing the overhead but making the stream non-seekable;
717		− Use of this option is not recommanded, as the resulting files are very damage
	717	+ Use of this option is not recommended, as the resulting files are very damage
718	718	sensitive and seeking is not possible. Also in general the overhead from
719	719	syncpoints is negligible. Note, -@code{write_index} 0 can be used to disable
720	720	all growing data tables, allowing to mux endless streams with limited memory

ffmpeg.c+1−1

@@ -270,7 +270,7 @@ static void sub2video_heartbeat(InputStream *ist, int64_t pts) · 269 unmodified lines
270	270	if (!ist2->sub2video.frame)
271	271	continue;
272	272	/* subtitles seem to be usually muxed ahead of other streams;
273		− if not, substracting a larger time here is necessary */
	273	+ if not, subtracting a larger time here is necessary */
274	274	pts2 = av_rescale_q(pts, ist->st->time_base, ist2->st->time_base) - 1;
275	275	/* do not send the heartbeat frame if the subtitle is already ahead */
276	276	if (pts2 <= ist2->sub2video.last_pts)

libavcodec/aacdec.c+1−1

@@ -1946,7 +1946,7 @@ static int decode_ics(AACContext ac, SingleChannelElement sce, · 1945 unmodified lines
1946	1946	avpriv_request_sample(ac->avctx, "SSR");
1947	1947	return AVERROR_PATCHWELCOME;
1948	1948	}
1949		− // I see no textual basis in the spec for this occuring after SSR gain
	1949	+ // I see no textual basis in the spec for this occurring after SSR gain
1950	1950	// control, but this is what both reference and real implmentations do
1951	1951	if (tns->present && er_syntax)
1952	1952	if (decode_tns(ac, tns, gb, ics) < 0)

libavcodec/avcodec.h+2−2

@@ -575,7 +575,7 @@ typedef struct AVCodecDescriptor { · 574 unmodified lines
575	575	/**
576	576	* MIME type(s) associated with the codec.
577	577	* May be NULL; if not, a NULL-terminated array of MIME types.
578		− * The first item is always non-NULL and is the prefered MIME type.
	578	+ * The first item is always non-NULL and is the preferred MIME type.
579	579	*/
580	580	const char const mime_types;
581	581	} AVCodecDescriptor;
@@ -4957,7 +4957,7 @@ AVBitStreamFilterContext av_bitstream_filter_init(const char name); · 4375 unmodified lines
4957	4957	* @return >= 0 in case of success, or a negative error code in case of failure
4958	4958	*
4959	4959	* If the return value is positive, an output buffer is allocated and
4960		− * is availble in *poutbuf, and is distinct from the input buffer.
	4960	+ * is available in *poutbuf, and is distinct from the input buffer.
4961	4961	*
4962	4962	* If the return value is 0, the output buffer is not allocated and
4963	4963	* should be considered identical to the input buffer, or in case

libavcodec/dcadec.c+1−1

@@ -2423,7 +2423,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 2422 unmodified lines
2423	2423	}
2424	2424	}
2425	2425
2426		− /* make sure that we have managed to get equivelant dts/avcodec channel
	2426	+ /* make sure that we have managed to get equivalent dts/avcodec channel
2427	2427	* masks in some sense -- unfortunately some channels could overlap */
2428	2428	if (av_popcount(channel_mask) != av_popcount(channel_layout)) {
2429	2429	av_log(avctx, AV_LOG_DEBUG,

libavcodec/dcaenc.c+1−1

@@ -868,7 +868,7 @@ static void put_subframe(DCAContext *c, int subframe) · 867 unmodified lines
868	868	for (band = 0; band < DCA_SUBBANDS; band++)
869	869	put_bits(&c->pb, 1, 0);
870	870
871		− /* Prediction VQ addres: not transmitted */
	871	+ /* Prediction VQ address: not transmitted */
872	872	/* Bit allocation index */
873	873	for (ch = 0; ch < c->fullband_channels; ch++)
874	874	for (band = 0; band < DCA_SUBBANDS; band++)

libavcodec/diracdec.c+2−2

@@ -199,7 +199,7 @@ typedef struct DiracContext { · 198 unmodified lines
199	199	uint8_t *edge_emu_buffer[4];
200	200	uint8_t *edge_emu_buffer_base;
201	201
202		− uint16_t mctmp; / buffer holding the MC data multipled by OBMC weights */
	202	+ uint16_t mctmp; / buffer holding the MC data multiplied by OBMC weights */
203	203	uint8_t *mcscratch;
204	204	int buffer_stride;
205	205
@@ -694,7 +694,7 @@ static void lowdelay_subband(DiracContext s, GetBitContext gb, int quant, · 488 unmodified lines
694	694	IDWTELEM buf1 = b1->ibuf + top b1->stride;
695	695	IDWTELEM buf2 = b2 ? b2->ibuf + top b2->stride : NULL;
696	696	int x, y;
697		− /* we have to constantly check for overread since the spec explictly
	697	+ /* we have to constantly check for overread since the spec explicitly
698	698	requires this, with the meaning that all remaining coeffs are set to 0 */
699	699	if (get_bits_count(gb) >= bits_end)
700	700	return;

libavcodec/indeo5.c+1−1

@@ -335,7 +335,7 @@ static int decode_pic_hdr(IVI45DecContext ctx, AVCodecContext avctx) · 334 unmodified lines
335	335	}
336	336
337	337	if (ctx->frame_type == FRAMETYPE_INTER_SCAL && !ctx->is_scalable) {
338		− av_log(avctx, AV_LOG_ERROR, "Scalable inter frame in non scaleable stream\n");
	338	+ av_log(avctx, AV_LOG_ERROR, "Scalable inter frame in non scalable stream\n");
339	339	ctx->frame_type = FRAMETYPE_INTER;
340	340	return AVERROR_INVALIDDATA;
341	341	}

libavcodec/jpeg2000.c+1−1

@@ -249,7 +249,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, · 248 unmodified lines
249	249	else
250	250	reslevel->nbands = 3;
251	251
252		− /* Number of precincts wich span the tile for resolution level reslevelno
	252	+ /* Number of precincts which span the tile for resolution level reslevelno
253	253	* see B.6 in ISO/IEC 15444-1:2002 eq. B-16
254	254	* num_precincts_x = \|- trx_1 / 2 ^ log2_prec_width) -\| - (trx_0 / 2 ^ log2_prec_width)
255	255	* num_precincts_y = \|- try_1 / 2 ^ log2_prec_width) -\| - (try_0 / 2 ^ log2_prec_width)

libavdevice/opengl_enc.c+5−5

@@ -66,7 +66,7 @@ · 65 unmodified lines
66	66
67	67	/* FF_GL_RED_COMPONENT is used for plannar pixel types.
68	68	* Only red component is sampled in shaders.
69		− * On some platforms GL_RED is not availabe and GL_LUMINANCE have to be used,
	69	+ * On some platforms GL_RED is not available and GL_LUMINANCE have to be used,
70	70	* but since OpenGL 3.0 GL_LUMINANCE is deprecated.
71	71	* GL_RED produces RGBA = value, 0, 0, 1.
72	72	* GL_LUMINANCE produces RGBA = value, value, value, 1.
@@ -583,7 +583,7 @@ static void opengl_make_ortho(float matrix[16], float left, float right, · 510 unmodified lines
583	583	static av_cold int opengl_read_limits(OpenGLContext *opengl)
584	584	{
585	585	static const struct{
586		− const char *extention;
	586	+ const char *extension;
587	587	int major;
588	588	int minor;
589	589	} required_extensions[] = {
@@ -603,12 +603,12 @@ static av_cold int opengl_read_limits(OpenGLContext *opengl) · 13 unmodified lines
603	603	av_log(opengl, AV_LOG_DEBUG, "OpenGL version: %s\n", version);
604	604	sscanf(version, "%d.%d", &major, &minor);
605	605
606		− for (i = 0; required_extensions[i].extention; i++) {
	606	+ for (i = 0; required_extensions[i].extension; i++) {
607	607	if (major < required_extensions[i].major &&
608	608	(major == required_extensions[i].major && minor < required_extensions[i].minor) &&
609		− !strstr(extensions, required_extensions[i].extention)) {
	609	+ !strstr(extensions, required_extensions[i].extension)) {
610	610	av_log(opengl, AV_LOG_ERROR, "Required extension %s is not supported.\n",
611		− required_extensions[i].extention);
	611	+ required_extensions[i].extension);
612	612	av_log(opengl, AV_LOG_DEBUG, "Supported extensions are: %s\n", extensions);
613	613	return AVERROR(ENOSYS);
614	614	}

libavfilter/buffersrc.h+1−1

@@ -138,7 +138,7 @@ int av_buffersrc_add_frame(AVFilterContext ctx, AVFrame frame); · 137 unmodified lines
138	138	* Add a frame to the buffer source.
139	139	*
140	140	* By default, if the frame is reference-counted, this function will take
141		− * ownership of the reference(s) and reset the frame. This can be controled
	141	+ * ownership of the reference(s) and reset the frame. This can be controlled
142	142	* using the flags.
143	143	*
144	144	* If this function returns an error, the input frame is not touched.

libavfilter/libmpcodecs/vf.h+1−1

@@ -103,7 +103,7 @@ typedef struct vf_seteq_s · 102 unmodified lines
103	103	#define VFCTRL_CHANGE_RECTANGLE 9 /* Change the rectangle boundaries */
104	104	#define VFCTRL_FLIP_PAGE 10 /* Tell the vo to flip pages */
105	105	#define VFCTRL_DUPLICATE_FRAME 11 /* For encoding - encode zero-change frame */
106		−#define VFCTRL_SKIP_NEXT_FRAME 12 /* For encoding - drop the next frame that passes thru */
	106	+#define VFCTRL_SKIP_NEXT_FRAME 12 /* For encoding - drop the next frame that passes through */
107	107	#define VFCTRL_FLUSH_FRAMES 13 /* For encoding - flush delayed frames */
108	108	#define VFCTRL_SCREENSHOT 14 /* Make a screenshot */
109	109	#define VFCTRL_INIT_EOSD 15 /* Select EOSD renderer */

libavfilter/libmpcodecs/vf_fspp.c+1−1

@@ -24,7 +24,7 @@ · 23 unmodified lines
24	24	* "Aria Nosratinia Embedded Post-Processing for
25	25	* Enhancement of Compressed Images (1999)"
26	26	* (http://citeseer.nj.nec.com/nosratinia99embedded.html)
27		− * Futher, with splitting (i)dct into hor/ver passes, one of them can be
	27	+ * Further, with splitting (i)dct into hor/ver passes, one of them can be
28	28	* performed once per block, not pixel. This allows for much better speed.
29	29	*/
30	30

libavfilter/vf_mp.c+1−1

@@ -210,7 +210,7 @@ int ff_mp_msg_test(int mod, int lev){ · 209 unmodified lines
210	210
211	211	void ff_init_avcodec(void)
212	212	{
213		− //we maybe should init but its kinda 1. unneeded 2. a bit inpolite from here
	213	+ //we maybe should init but its kinda 1. unneeded 2. a bit impolite from here
214	214	}
215	215
216	216	//Exact copy of vf.c

libavfilter/vf_smartblur.c+3−3

@@ -201,7 +201,7 @@ static void blur(uint8_t *dst, const int dst_linesize, · 200 unmodified lines
201	201	if (diff > 2 * threshold)
202	202	dst[x + y * dst_linesize] = orig;
203	203	else if (diff > threshold)
204		− /* add 'diff' and substract 'threshold' from 'filtered' */
	204	+ /* add 'diff' and subtract 'threshold' from 'filtered' */
205	205	dst[x + y * dst_linesize] = orig - threshold;
206	206	} else {
207	207	if (-diff > 2 * threshold)
@@ -223,13 +223,13 @@ static void blur(uint8_t *dst, const int dst_linesize, · 15 unmodified lines
223	223	if (diff <= -threshold)
224	224	dst[x + y * dst_linesize] = orig;
225	225	else if (diff <= -2 * threshold)
226		− /* substract 'diff' and 'threshold' from 'orig' */
	226	+ /* subtract 'diff' and 'threshold' from 'orig' */
227	227	dst[x + y * dst_linesize] = filtered - threshold;
228	228	} else {
229	229	if (diff >= threshold)
230	230	dst[x + y * dst_linesize] = orig;
231	231	else if (diff >= 2 * threshold)
232		− /* add 'threshold' and substract 'diff' from 'orig' */
	232	+ /* add 'threshold' and subtract 'diff' from 'orig' */
233	233	dst[x + y * dst_linesize] = filtered + threshold;
234	234	}
235	235	}

libavformat/avio_internal.h+1−1

@@ -93,7 +93,7 @@ int ffio_set_buf_size(AVIOContext *s, int buf_size); · 92 unmodified lines
93	93	*
94	94	* Will ensure that when reading sequentially up to buf_size, seeking
95	95	* within the current pos and pos+buf_size is possible.
96		− * Once the stream position moves outside this window this gurantee is lost.
	96	+ * Once the stream position moves outside this window this guarantee is lost.
97	97	*/
98	98	int ffio_ensure_seekback(AVIOContext *s, int buf_size);
99	99

libavformat/brstm.c+1−1

@@ -200,7 +200,7 @@ static int read_header(AVFormatContext *s) · 199 unmodified lines
200	200	goto fail;
201	201	}
202	202	if (b->adpc) {
203		− av_log(s, AV_LOG_WARNING, "skipping additonal ADPC chunk\n");
	203	+ av_log(s, AV_LOG_WARNING, "skipping additional ADPC chunk\n");
204	204	goto skip;
205	205	} else {
206	206	b->adpc = av_mallocz(asize);

libavformat/ffmdec.c+1−1

@@ -510,7 +510,7 @@ static int ffm_read_packet(AVFormatContext s, AVPacket pkt) · 509 unmodified lines
510	510	if (ffm_read_data(s, ffm->header+16, 4, 1) != 4)
511	511	return -1;
512	512	ffm->read_state = READ_DATA;
513		− /* fall thru */
	513	+ /* fall through */
514	514	case READ_DATA:
515	515	size = AV_RB24(ffm->header + 2);
516	516	if ((ret = ffm_is_avail_data(s, size)) < 0)

libavformat/hevc.c+1−1

@@ -799,7 +799,7 @@ static void hvcc_init(HEVCDecoderConfigurationRecord *hvcc) · 798 unmodified lines
799	799
800	800	/*
801	801	* Initialize this field with an invalid value which can be used to detect
802		− * whether we didn't see any VUI (in wich case it should be reset to zero).
	802	+ * whether we didn't see any VUI (in which case it should be reset to zero).
803	803	*/
804	804	hvcc->min_spatial_segmentation_idc = MAX_SPATIAL_SEGMENTATION + 1;
805	805	}

libavformat/mpeg.c+1−1

@@ -464,7 +464,7 @@ static int mpegps_read_packet(AVFormatContext *s, · 463 unmodified lines
464	464	MpegDemuxContext *m = s->priv_data;
465	465	AVStream *st;
466	466	int len, startcode, i, es_type, ret;
467		− int lpcm_header_len = -1; //Init to supress warning
	467	+ int lpcm_header_len = -1; //Init to suppress warning
468	468	int request_probe= 0;
469	469	enum AVCodecID codec_id = AV_CODEC_ID_NONE;
470	470	enum AVMediaType type;

libavutil/bprint.c+1−1

@@ -356,7 +356,7 @@ int main(void) · 355 unmodified lines
356	356	av_bprint_init(&b, 0, 1);
357	357	bprint_pascal(&b, 25);
358	358	printf("Long text in automatic buffer: %u/%u\n", (unsigned)strlen(b.str)/8*8, b.len);
359		− /* Note that the size of the automatic buffer is arch-dependant. */
	359	+ /* Note that the size of the automatic buffer is arch-dependent. */
360	360
361	361	av_bprint_init(&b, 0, 0);
362	362	bprint_pascal(&b, 25);

libavutil/mathematics.h+1−1

@@ -146,7 +146,7 @@ int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb, int · 145 unmodified lines
146	146	/**
147	147	* Add a value to a timestamp.
148	148	*
149		− * This function gurantees that when the same value is repeatly added that
	149	+ * This function guarantees that when the same value is repeatly added that
150	150	* no accumulation of rounding errors occurs.
151	151	*
152	152	* @param ts Input timestamp

libavutil/pixdesc.h+1−1

@@ -257,7 +257,7 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc); · 256 unmodified lines
257	257	*
258	258	* See av_get_chroma_sub_sample() for a function that asserts a
259	259	* valid pixel format instead of returning an error code.
260		− * Its recommanded that you use avcodec_get_chroma_sub_sample unless
	260	+ * Its recommended that you use avcodec_get_chroma_sub_sample unless
261	261	* you do check the return code!
262	262	*
263	263	* @param[in] pix_fmt the pixel format

libswresample/swresample-test.c+1−1

@@ -164,7 +164,7 @@ static void audiogen(void *data, enum AVSampleFormat sample_fmt, · 163 unmodified lines
164	164	a += M_PI * 1000.0 * 2.0 / sample_rate;
165	165	}
166	166
167		− /* 1 second of varing frequency between 100 and 10000 Hz */
	167	+ /* 1 second of varying frequency between 100 and 10000 Hz */
168	168	a = 0;
169	169	for (i = 0; i < 1 * sample_rate && k < nb_samples; i++, k++) {
170	170	v = sin(a) * 0.30;

tools/patcheck+1−1

@@ -67,7 +67,7 @@ $EGREP $OPT '^\+ (const \|)static' $\| $EGREP --color=always '[^=]= (0\|NULL)[^ · 66 unmodified lines
67	67	cat $TMP
68	68	hiegrep '# ifdef (HAVE\|CONFIG)_' 'ifdefs that should be #if' $*
69	69
70		−hiegrep '\b(awnser\|cant\|dont\|wont\|doesnt\|usefull\|successfull\|occured\|teh\|alot\|wether\|skiped\|skiping\|heigth\|informations\|colums\|loosy\|loosing\|ouput\|seperate\|preceed\|upto\|paket\|posible\|unkown\|inpossible\|dimention\|acheive\|funtions\|overriden\|outputing\|seperation\|initalize\|compatibilty\|bistream\|knwon\|unknwon)\b' 'common typos' $*
	70	+hiegrep '\b(awnser\|cant\|dont\|wont\|doesnt\|usefull\|successfull\|occured\|teh\|alot\|wether\|skiped\|skiping\|heigth\|informations\|colums\|loosy\|loosing\|ouput\|seperate\|preceed\|upto\|paket\|posible\|unkown\|inpossible\|dimention\|acheive\|funtions\|overriden\|outputing\|seperation\|initalize\|compatibilty\|bistream\|knwon\|unknwon\|choosen\|additonal\|gurantee\|availble\|wich)\b' 'common typos' $*
71	71
72	72	hiegrep 'av_log\( NULL' 'Missing context in av_log' $
73	73	hiegrep '[^sn]printf' 'Please use av_log' $*

fix various typos

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code