ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Tue Sep 29 20:08:26 2015 +0200| [8d6625642db064a45224cb7a8e037f6e79a6554d] | committer: Andreas Cadhalpun
doc: fix spelling errors Reviewed-by: Lou Logan <l...@lrcd.com> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d6625642db064a45224cb7a8e037f6e79a6554d --- doc/encoders.texi | 2 +- doc/filters.texi | 14 +++++++------- libavcodec/g726.c | 2 +- libavcodec/vaapi_hevc.c | 2 +- libavfilter/x86/vf_removegrain.asm | 4 ++-- libavformat/asfdec_o.c | 6 +++--- libavformat/ffmdec.c | 2 +- libavformat/mov.c | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index d7023bf..ba7f2b7 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1411,7 +1411,7 @@ can be selected with @code{-pred 1}. @table @option @item format Can be set to either @code{j2k} or @code{jp2} (the default) that -allows to store non-rgb pix_fmts. +makes it possible to store non-rgb pix_fmts. @end table diff --git a/doc/filters.texi b/doc/filters.texi index 506b5a6..9ab7d43 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1118,7 +1118,7 @@ Number_of_samples For example full key look like this @code{lavfi.astats.1.DC_offset} or this @code{lavfi.astats.Overall.Peak_count}. -For description what each key means read bellow. +For description what each key means read below. @item reset Set number of frame after which stats are going to be recalculated. @@ -2400,7 +2400,7 @@ Amount of milliseconds the signal has to rise above the threshold before gain reduction starts. Default is 20. Range is between 0.01 and 2000. @item release -Amount of milliseconds the signal has to fall bellow the threshold before +Amount of milliseconds the signal has to fall below the threshold before reduction is decreased again. Default is 250. Range is between 0.01 and 9000. @item makeup @@ -4533,7 +4533,7 @@ It accepts the following options: @item threshold1 @item threshold2 @item threshold3 -Allows to limit the maximum change for each plane, default is 65535. +Limit the maximum change for each plane, default is 65535. If 0, plane will remain unchanged. @end table @@ -4738,7 +4738,7 @@ It accepts the following options: @item threshold1 @item threshold2 @item threshold3 -Allows to limit the maximum change for each plane, default is 65535. +Limit the maximum change for each plane, default is 65535. If 0, plane will remain unchanged. @item coordinates @@ -5675,7 +5675,7 @@ It accepts the following options: @item threshold1 @item threshold2 @item threshold3 -Allows to limit the maximum change for each plane, default is 65535. +Limit the maximum change for each plane, default is 65535. If 0, plane will remain unchanged. @item coordinates @@ -7369,7 +7369,7 @@ It accepts the following options: @item threshold1 @item threshold2 @item threshold3 -Allows to limit the maximum change for each plane, default is 65535. +Limit the maximum change for each plane, default is 65535. If 0, plane will remain unchanged. @end table @@ -10405,7 +10405,7 @@ stereo3d=sbsl:aybd @end example @item -Convert input video from above bellow (left eye above, right eye below) to side by side crosseye. +Convert input video from above below (left eye above, right eye below) to side by side crosseye. @example stereo3d=abl:sbsr @end example diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 934d120..c3d018f 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -32,7 +32,7 @@ /** * G.726 11bit float. - * G.726 Standard uses rather odd 11bit floating point arithmentic for + * G.726 Standard uses rather odd 11bit floating point arithmetic for * numerous occasions. It's a mystery to me why they did it this way * instead of simply using 32bit integer arithmetic. */ diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c index 762511f..62f783e 100644 --- a/libavcodec/vaapi_hevc.c +++ b/libavcodec/vaapi_hevc.c @@ -205,7 +205,7 @@ static void fill_picture_parameters(const HEVCContext *h, VAPictureParameterBuff pp->pps_tc_offset_div2 = h->ps.pps->tc_offset / 2; pp->log2_parallel_merge_level_minus2 = h->ps.pps->log2_parallel_merge_level - 2; - /* Diffrent chroma/luma bit depths are currently not supported by ffmpeg. */ + /* Different chroma/luma bit depths are currently not supported by ffmpeg. */ pp->bit_depth_luma_minus8 = h->ps.sps->bit_depth - 8; pp->bit_depth_chroma_minus8 = h->ps.sps->bit_depth - 8; diff --git a/libavfilter/x86/vf_removegrain.asm b/libavfilter/x86/vf_removegrain.asm index 0cc6e5f..d049bf2 100644 --- a/libavfilter/x86/vf_removegrain.asm +++ b/libavfilter/x86/vf_removegrain.asm @@ -359,7 +359,7 @@ cglobal rg_fl_mode_6, 4, 5, 16, 0, dst, src, stride, pixels paddw m2, m7 ; c2 paddw m3, m6 ; c3 paddw m4, m5 ; c4 - ; As the differences (d1..d4) can only be postive, there is no need to + ; As the differences (d1..d4) can only be positive, there is no need to ; clip to zero. Also, the maximum positive value is less than 768. pminsw m1, m2 @@ -485,7 +485,7 @@ cglobal rg_fl_mode_8, 4, 5, 16, 0, dst, src, stride, pixels paddw m2, m7 ; c1 paddw m3, m6 ; c1 paddw m4, m5 ; c1 - ; As the differences (d1..d4) can only be postive, there is no need to + ; As the differences (d1..d4) can only be positive, there is no need to ; clip to zero. Also, the maximum positive value is less than 768. pminsw m1, m2 diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index cf2a01e..6b4216c 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -1042,8 +1042,8 @@ static const GUIDParseTable gdef[] = { { "Mutex Language", { 0xD6, 0xE2, 0x2A, 0x00, 0x25, 0xDA, 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE }, asf_read_unknown, 1 }, { "Mutex Bitrate", { 0xD6, 0xE2, 0x2A, 0x01, 0x25, 0xDA, 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE }, asf_read_unknown, 1 }, { "Mutex Unknown", { 0xD6, 0xE2, 0x2A, 0x02, 0x25, 0xDA, 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE }, asf_read_unknown, 1 }, - { "Bandwith Sharing Exclusive", { 0xAF, 0x60, 0x60, 0xAA, 0x51, 0x97, 0x11, 0xD2, 0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9 }, asf_read_unknown, 1 }, - { "Bandwith Sharing Partial", { 0xAF, 0x60, 0x60, 0xAB, 0x51, 0x97, 0x11, 0xD2, 0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9 }, asf_read_unknown, 1 }, + { "Bandwidth Sharing Exclusive", { 0xAF, 0x60, 0x60, 0xAA, 0x51, 0x97, 0x11, 0xD2, 0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9 }, asf_read_unknown, 1 }, + { "Bandwidth Sharing Partial", { 0xAF, 0x60, 0x60, 0xAB, 0x51, 0x97, 0x11, 0xD2, 0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9 }, asf_read_unknown, 1 }, { "Payload Extension System Timecode", { 0x39, 0x95, 0x95, 0xEC, 0x86, 0x67, 0x4E, 0x2D, 0x8F, 0xDB, 0x98, 0x81, 0x4C, 0xE7, 0x6C, 0x1E }, asf_read_unknown, 1 }, { "Payload Extension System File Name", { 0xE1, 0x65, 0xEC, 0x0E, 0x19, 0xED, 0x45, 0xD7, 0xB4, 0xA7, 0x25, 0xCB, 0xD1, 0xE2, 0x8E, 0x9B }, asf_read_unknown, 1 }, { "Payload Extension System Content Type", { 0xD5, 0x90, 0xDC, 0x20, 0x07, 0xBC, 0x43, 0x6C, 0x9C, 0xF7, 0xF3, 0xBB, 0xFB, 0xF1, 0xA4, 0xDC }, asf_read_unknown, 1 }, @@ -1163,7 +1163,7 @@ static int asf_read_multiple_payload(AVFormatContext *s, AVPacket *pkt, int ret; int skip = 0; - // if replicated lenght is 1, subpayloads are present + // if replicated length is 1, subpayloads are present if (asf->rep_data_len == 1) { asf->sub_left = 1; asf->state = READ_MULTI_SUB; diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 110d315..b743c87 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -151,7 +151,7 @@ static int ffm_read_data(AVFormatContext *s, return size1 - size; } -/* ensure that acutal seeking happens between FFM_PACKET_SIZE +/* ensure that actual seeking happens between FFM_PACKET_SIZE and file_size - FFM_PACKET_SIZE */ static int64_t ffm_seek1(AVFormatContext *s, int64_t pos1) { diff --git a/libavformat/mov.c b/libavformat/mov.c index da170a6..78596f5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -893,9 +893,9 @@ static int mov_read_adrm(MOVContext *c, AVIOContext *pb, MOVAtom atom) } /* drm blob processing */ - avio_read(pb, output, 8); // go to offset 8, absolute postion 0x251 + avio_read(pb, output, 8); // go to offset 8, absolute position 0x251 avio_read(pb, input, DRM_BLOB_SIZE); - avio_read(pb, output, 4); // go to offset 4, absolute postion 0x28d + avio_read(pb, output, 4); // go to offset 4, absolute position 0x28d avio_read(pb, file_checksum, 20); av_log(c->fc, AV_LOG_INFO, "[aax] file checksum == "); // required by external tools _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog