summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/decoders.texi2
-rw-r--r--doc/encoders.texi2
-rw-r--r--doc/filters.texi6
-rw-r--r--doc/protocols.texi2
-rw-r--r--ffmpeg.c4
-rw-r--r--libavcodec/cfhd.c2
-rw-r--r--libavcodec/vaapi_encode.c2
-rw-r--r--libavdevice/dv1394.c4
-rw-r--r--libavformat/aviobuf.c2
-rw-r--r--libavformat/cinedec.c2
-rw-r--r--libavformat/mxfenc.c2
-rw-r--r--libavformat/psxstr.c2
-rw-r--r--libavformat/sdp.c2
13 files changed, 17 insertions, 17 deletions
diff --git a/doc/decoders.texi b/doc/decoders.texi
index 35771140e1..babe129767 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -279,7 +279,7 @@ present between the subtitle lines because of double-sized teletext charactes.
Default value is 1.
@item txt_duration
Sets the display duration of the decoded teletext pages or subtitles in
-miliseconds. Default value is 30000 which is 30 seconds.
+milliseconds. Default value is 30000 which is 30 seconds.
@item txt_transparent
Force transparent background of the generated teletext bitmaps. Default value
is 0 which means an opaque background.
diff --git a/doc/encoders.texi b/doc/encoders.texi
index d0caa77ee3..321eb2f880 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -1401,7 +1401,7 @@ is 0. This is only used when @option{slice_mode} is set to
@samp{fixed}.
@item slice_mode
-Set slice mode. Can assume one of the follwing possible values:
+Set slice mode. Can assume one of the following possible values:
@table @samp
@item fixed
diff --git a/doc/filters.texi b/doc/filters.texi
index 42341ea9f3..24abdda095 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -3243,7 +3243,7 @@ silenceremove=1:5:0.02
@end example
@item
-Trim all silence encountered from begining to end where there is more than 1
+Trim all silence encountered from beginning to end where there is more than 1
second of silence in audio:
@example
silenceremove=0:0:0:-1:1:-90dB
@@ -4713,7 +4713,7 @@ ffmpeg -f lavfi -i color=c=black:s=1280x720 -i video.mp4 -shortest -filter_compl
Display CIE color diagram with pixels overlaid onto it.
-The filter acccepts the following options:
+The filter accepts the following options:
@table @option
@item system
@@ -4743,7 +4743,7 @@ Set CIE system.
@item gamuts
Set what gamuts to draw.
-See @code{system} option for avaiable values.
+See @code{system} option for available values.
@item size, s
Set ciescope size, by default set to 512.
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 72b39145ec..9bbd1315fc 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -695,7 +695,7 @@ This protocol accepts the following options.
@table @option
@item timeout
-Set timeout in miliseconds of socket I/O operations used by the underlying
+Set timeout in milliseconds of socket I/O operations used by the underlying
low level operation. By default it is set to -1, which means that the timeout
is not specified.
diff --git a/ffmpeg.c b/ffmpeg.c
index 9ffd833a91..b29be1ebd5 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3499,12 +3499,12 @@ static int check_keyboard_interaction(int64_t cur_time)
key == 'c' ? AVFILTER_CMD_FLAG_ONE : 0);
fprintf(stderr, "Command reply for stream %d: ret:%d res:\n%s", i, ret, buf);
} else if (key == 'c') {
- fprintf(stderr, "Queing commands only on filters supporting the specific command is unsupported\n");
+ fprintf(stderr, "Queuing commands only on filters supporting the specific command is unsupported\n");
ret = AVERROR_PATCHWELCOME;
} else {
ret = avfilter_graph_queue_command(fg->graph, target, command, arg, 0, time);
if (ret < 0)
- fprintf(stderr, "Queing command failed with error %s\n", av_err2str(ret));
+ fprintf(stderr, "Queuing command failed with error %s\n", av_err2str(ret));
}
}
}
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index 74facd462d..e8f859c8aa 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -513,7 +513,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
}
if (highpass_height > highpass_a_height || highpass_width > highpass_a_width || a_expected < expected) {
- av_log(avctx, AV_LOG_ERROR, "Too many highpass coefficents\n");
+ av_log(avctx, AV_LOG_ERROR, "Too many highpass coefficients\n");
ret = AVERROR(EINVAL);
goto end;
}
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index c55a78361c..8c9a3bda3b 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -334,7 +334,7 @@ static int vaapi_encode_issue(AVCodecContext *avctx,
if (ctx->codec->init_slice_params) {
err = ctx->codec->init_slice_params(avctx, pic, slice);
if (err < 0) {
- av_log(avctx, AV_LOG_ERROR, "Failed to initalise slice "
+ av_log(avctx, AV_LOG_ERROR, "Failed to initialise slice "
"parameters: %d.\n", err);
goto fail;
}
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 9f02780e72..c3483010fa 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -137,7 +137,7 @@ static int dv1394_read_packet(AVFormatContext *context, AVPacket *pkt)
* We have to reset :(.
*/
- av_log(context, AV_LOG_ERROR, "DV1394: Ring buffer overflow. Reseting ..\n");
+ av_log(context, AV_LOG_ERROR, "DV1394: Ring buffer overflow. Resetting ..\n");
dv1394_reset(dv);
dv1394_start(dv);
@@ -173,7 +173,7 @@ restart_poll:
dv->done = 0;
if (s.dropped_frames) {
- av_log(context, AV_LOG_ERROR, "DV1394: Frame drop detected (%d). Reseting ..\n",
+ av_log(context, AV_LOG_ERROR, "DV1394: Frame drop detected (%d). Resetting ..\n",
s.dropped_frames);
dv1394_reset(dv);
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 95793c92cd..31e72021f1 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -385,7 +385,7 @@ static inline int put_str16(AVIOContext *s, const char *str, const int be)
ret += 2;)
continue;
invalid:
- av_log(s, AV_LOG_ERROR, "Invaid UTF8 sequence in avio_put_str16%s\n", be ? "be" : "le");
+ av_log(s, AV_LOG_ERROR, "Invalid UTF8 sequence in avio_put_str16%s\n", be ? "be" : "le");
err = AVERROR(EINVAL);
if (!*(q-1))
break;
diff --git a/libavformat/cinedec.c b/libavformat/cinedec.c
index 0efedda1a3..32cccf566b 100644
--- a/libavformat/cinedec.c
+++ b/libavformat/cinedec.c
@@ -111,7 +111,7 @@ static int cine_read_header(AVFormatContext *avctx)
compression = avio_rl16(pb);
version = avio_rl16(pb);
if (version != 1) {
- avpriv_request_sample(avctx, "uknown version %i", version);
+ avpriv_request_sample(avctx, "unknown version %i", version);
return AVERROR_INVALIDDATA;
}
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 0c04a396cc..80318b8903 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -671,7 +671,7 @@ static uint64_t mxf_utf16len(const char *utf8_str)
size += 2;
continue;
invalid:
- av_log(NULL, AV_LOG_ERROR, "Invaid UTF8 sequence in mxf_utf16len\n\n");
+ av_log(NULL, AV_LOG_ERROR, "Invalid UTF8 sequence in mxf_utf16len\n\n");
}
size += 1;
return size;
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 63598fe72b..f7b9495bb9 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -211,7 +211,7 @@ static int str_read_packet(AVFormatContext *s,
if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){
if(pkt->data)
- av_log(s, AV_LOG_ERROR, "missmatching sector_count\n");
+ av_log(s, AV_LOG_ERROR, "mismatching sector_count\n");
av_packet_unref(pkt);
if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE))
return AVERROR(EIO);
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 01b564b7be..4e37f65b09 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -641,7 +641,7 @@ static char *sdp_write_media_attributes(char *buff, int size, AVStream *st, int
if (p->extradata_size)
config = xiph_extradata2config(fmt, p);
else
- av_log(fmt, AV_LOG_ERROR, "Theora configuation info missing\n");
+ av_log(fmt, AV_LOG_ERROR, "Theora configuration info missing\n");
if (!config)
return NULL;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 00:24:13 +0000