Skip to content

Commit

Permalink
fix spelling errors
Browse files Browse the repository at this point in the history
 opttimizations -> optimizations
 grabing        -> grabbing
 many resource  -> many resources
 isnt           -> isn't
 silcense       -> silence

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 482c86f)
  • Loading branch information
Andreas Cadhalpun authored and ubitux committed Mar 6, 2015
1 parent 1dab67b commit 4e2cab5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ version 2.6:
- Canopus HQX decoder
- RTP depacketization of T.140 text (RFC 4103)
- VP9 RTP payload format (draft 0) experimental depacketizer
- Port MIPS opttimizations to 64-bit
- Port MIPS optimizations to 64-bit


version 2.5:
Expand Down
2 changes: 1 addition & 1 deletion doc/indevs.texi
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ The syntax is:
-grab_x @var{x_offset} -grab_y @var{y_offset}
@end example

Set the grabing region coordinates. The are expressed as offset from the top left
Set the grabbing region coordinates. They are expressed as offset from the top left
corner of the X11 window. The default value is 0.

@section decklink
Expand Down
10 changes: 5 additions & 5 deletions doc/protocols.texi
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ cache:@var{URL}

Physical concatenation protocol.

Allow to read and seek from many resource in sequence as if they were
Read and seek from many resources in sequence as if they were
a unique resource.

A URL accepted by this protocol has the syntax:
Expand Down Expand Up @@ -117,7 +117,7 @@ ffmpeg -i "data:image/gif;base64,R0lGODdhCAAIAMIEAAAAAAAA//8AAP//AP/////////////

File access protocol.

Allow to read from or write to a file.
Read from or write to a file.

A file URL can have the form:
@example
Expand Down Expand Up @@ -155,7 +155,7 @@ time, which is valuable for files on slow medium.

FTP (File Transfer Protocol).

Allow to read from or write to remote resources using FTP protocol.
Read from or write to remote resources using FTP protocol.

Following syntax is required.
@example
Expand Down Expand Up @@ -374,7 +374,7 @@ be seekable, so they will fail with the MD5 output protocol.

UNIX pipe access protocol.

Allow to read and write from UNIX pipes.
Read and write from UNIX pipes.

The accepted syntax is:
@example
Expand Down Expand Up @@ -614,7 +614,7 @@ For more information see: @url{http://www.samba.org/}.

Secure File Transfer Protocol via libssh

Allow to read from or write to remote resources using SFTP protocol.
Read from or write to remote resources using SFTP protocol.

Following syntax is required.

Expand Down
2 changes: 1 addition & 1 deletion libavdevice/v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ static int v4l2_set_parameters(AVFormatContext *ctx)
}
} else {
av_log(ctx, AV_LOG_WARNING,
"The driver does not allow to change time per frame\n");
"The driver does not permit changing the time per frame\n");
}
}
if (tpf->denominator > 0 && tpf->numerator > 0) {
Expand Down
4 changes: 2 additions & 2 deletions libavformat/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static int add_entry(URLContext *h, const unsigned char *buf, int size)

return 0;
fail:
//we could truncate the file to pos here if pos >=0 but ftruncate isnt available in VS so
//we could truncate the file to pos here if pos >=0 but ftruncate isn't available in VS so
//for simplicty we just leave the file a bit larger
av_free(entry);
av_free(node);
Expand Down Expand Up @@ -300,7 +300,7 @@ static int cache_close(URLContext *h)
#define D AV_OPT_FLAG_DECODING_PARAM

static const AVOption options[] = {
{ "read_ahead_limit", "Amount in bytes that may be read ahead when seeking isnt supported, -1 for unlimited", OFFSET(read_ahead_limit), AV_OPT_TYPE_INT, { .i64 = 65536 }, -1, INT_MAX, D },
{ "read_ahead_limit", "Amount in bytes that may be read ahead when seeking isn't supported, -1 for unlimited", OFFSET(read_ahead_limit), AV_OPT_TYPE_INT, { .i64 = 65536 }, -1, INT_MAX, D },
{NULL},
};

Expand Down
2 changes: 1 addition & 1 deletion libavformat/rmdec.c
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ static int rm_assemble_video_frame(AVFormatContext *s, AVIOContext *pb,
int64_t *timestamp)
{
int hdr;
int seq = 0, pic_num = 0, len2 = 0, pos = 0; //init to silcense compiler warning
int seq = 0, pic_num = 0, len2 = 0, pos = 0; //init to silence compiler warning
int type;
int ret;

Expand Down

0 comments on commit 4e2cab5

Please sign in to comment.