summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Doxyfile2
-rw-r--r--doc/ffmpeg-resampler.texi2
-rw-r--r--doc/ffmpeg-scaler.texi2
-rw-r--r--doc/ffprobe.texi2
-rw-r--r--doc/filters.texi2
-rw-r--r--doc/libswresample.texi2
-rw-r--r--libavcodec/pgssubdec.c2
-rw-r--r--libavcodec/utils.c2
-rw-r--r--libavfilter/f_ebur128.c2
-rw-r--r--libavutil/pixdesc.h2
10 files changed, 10 insertions, 10 deletions
diff --git a/doc/Doxyfile b/doc/Doxyfile
index f01a305008..6488aadd35 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -33,7 +33,7 @@ PROJECT_NAME = FFmpeg
PROJECT_NUMBER =
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included
+# With the PROJECT_LOGO tag one can specify a logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55
# pixels and the maximum width should not exceed 200 pixels. Doxygen will
# copy the logo to the output directory.
diff --git a/doc/ffmpeg-resampler.texi b/doc/ffmpeg-resampler.texi
index da3d033f0e..69767a29ca 100644
--- a/doc/ffmpeg-resampler.texi
+++ b/doc/ffmpeg-resampler.texi
@@ -12,7 +12,7 @@
@chapter Description
@c man begin DESCRIPTION
-The FFmpeg resampler provides an high-level interface to the
+The FFmpeg resampler provides a high-level interface to the
libswresample library audio resampling utilities. In particular it
allows to perform audio resampling, audio channel layout rematrixing,
and convert audio format and packing layout.
diff --git a/doc/ffmpeg-scaler.texi b/doc/ffmpeg-scaler.texi
index 47b81a4f8b..1eb8cd6bdd 100644
--- a/doc/ffmpeg-scaler.texi
+++ b/doc/ffmpeg-scaler.texi
@@ -12,7 +12,7 @@
@chapter Description
@c man begin DESCRIPTION
-The FFmpeg rescaler provides an high-level interface to the libswscale
+The FFmpeg rescaler provides a high-level interface to the libswscale
library image conversion utilities. In particular it allows to perform
image rescaling and pixel format conversion.
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index 02cffbb478..daeb8cbe61 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -113,7 +113,7 @@ ffprobe -show_packets -select_streams v:1 INPUT
@end example
@item -show_data
-Show payload data, as an hexadecimal and ASCII dump. Coupled with
+Show payload data, as a hexadecimal and ASCII dump. Coupled with
@option{-show_packets}, it will dump the packets' data. Coupled with
@option{-show_streams}, it will dump the codec extradata.
diff --git a/doc/filters.texi b/doc/filters.texi
index aba67c7e5a..9786e13e94 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1644,7 +1644,7 @@ The filter has no parameters. The input is not modified. Statistics about
the volume will be printed in the log when the input stream end is reached.
In particular it will show the mean volume (root mean square), maximum
-volume (on a per-sample basis), and the beginning of an histogram of the
+volume (on a per-sample basis), and the beginning of a histogram of the
registered volume values (from the maximum value to a cumulated 1/1000 of
the samples).
diff --git a/doc/libswresample.texi b/doc/libswresample.texi
index 1a5b01f3be..383e53779a 100644
--- a/doc/libswresample.texi
+++ b/doc/libswresample.texi
@@ -20,7 +20,7 @@ Specifically, this library performs the following conversions:
@itemize
@item
@emph{Resampling}: is the process of changing the audio rate, for
-example from an high sample rate of 44100Hz to 8000Hz. Audio
+example from a high sample rate of 44100Hz to 8000Hz. Audio
conversion from high to low sample rate is a lossy process. Several
resampling options and algorithms are available.
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index d0cff7bba6..a981c0ed50 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -98,7 +98,7 @@ static av_cold int close_decoder(AVCodecContext *avctx)
/**
* Decode the RLE data.
*
- * The subtitle is stored as an Run Length Encoded image.
+ * The subtitle is stored as a Run Length Encoded image.
*
* @param avctx contains the current codec context
* @param sub pointer to the processed subtitle data
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f845349a5f..3ae4af6a9e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -747,7 +747,7 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags)
#if FF_API_GET_BUFFER
FF_DISABLE_DEPRECATION_WARNINGS
/*
- * Wrap an old get_buffer()-allocated buffer in an bunch of AVBuffers.
+ * Wrap an old get_buffer()-allocated buffer in a bunch of AVBuffers.
* We wrap each plane in its own AVBuffer. Each of those has a reference to
* a dummy AVBuffer as its private data, unreffing it on free.
* When all the planes are freed, the dummy buffer's free callback calls
diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c
index 88d37e8f83..acfc1fb957 100644
--- a/libavfilter/f_ebur128.c
+++ b/libavfilter/f_ebur128.c
@@ -64,7 +64,7 @@
#define HIST_SIZE ((ABS_UP_THRES - ABS_THRES) * HIST_GRAIN + 1)
/**
- * An histogram is an array of HIST_SIZE hist_entry storing all the energies
+ * A histogram is an array of HIST_SIZE hist_entry storing all the energies
* recorded (with an accuracy of 1/HIST_GRAIN) of the loudnesses from ABS_THRES
* (at 0) to ABS_UP_THRES (at HIST_SIZE-1).
* This fixed-size system avoids the need of a list of energies growing
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index b7b96b7cec..67b8dbc1a2 100644
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -203,7 +203,7 @@ const char *av_get_pix_fmt_name(enum AVPixelFormat pix_fmt);
/**
* Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
+ * number pix_fmt, or a header if pix_fmt is negative.
*
* @param buf the buffer where to write the string
* @param buf_size the size of buf