aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-07-17 12:57:50 +0000
committerDiego Biurrun <diego@biurrun.de>2007-07-17 12:57:50 +0000
commitf1ea5c2a967125bfd5250e1062f949f5edce75c2 (patch)
treef2635ed9d64ea95f8b01097c8940b8d724bf0f6d /libavcodec
parent04d2e45f3f9a8eebde9a0aef3a3e4baeed59e9a3 (diff)
downloadffmpeg-f1ea5c2a967125bfd5250e1062f949f5edce75c2.tar.gz
typo fixes
Originally committed as revision 9719 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/imgconvert.c6
-rw-r--r--libavcodec/imgconvert_template.h2
-rw-r--r--libavcodec/pngdec.c2
-rw-r--r--libavcodec/resample.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 477a62bf09..db8709f6ee 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -1,5 +1,5 @@
/*
- * Misc image convertion routines
+ * Misc image conversion routines
* Copyright (c) 2001, 2002, 2003 Fabrice Bellard.
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file imgconvert.c
- * Misc image convertion routines.
+ * misc image conversion routines
*/
/* TODO:
@@ -1852,7 +1852,7 @@ typedef struct ConvertEntry {
const AVPicture *src, int width, int height);
} ConvertEntry;
-/* Add each new convertion function in this table. In order to be able
+/* Add each new conversion function in this table. In order to be able
to convert from any format to any format, the following constraints
must be satisfied:
diff --git a/libavcodec/imgconvert_template.h b/libavcodec/imgconvert_template.h
index 70c090badd..b5f5cbe77a 100644
--- a/libavcodec/imgconvert_template.h
+++ b/libavcodec/imgconvert_template.h
@@ -1,5 +1,5 @@
/*
- * Templates for image convertion routines
+ * templates for image conversion routines
* Copyright (c) 2001, 2002, 2003 Fabrice Bellard.
*
* This file is part of FFmpeg.
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 1b7319fe7e..b68ea4db10 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -72,7 +72,7 @@ static const uint8_t png_pass_dsp_mask[NB_PASSES] = {
};
/* NOTE: we try to construct a good looking image at each pass. width
- is the original image width. We also do pixel format convertion at
+ is the original image width. We also do pixel format conversion at
this stage */
static void png_put_interlaced_row(uint8_t *dst, int width,
int bits_per_pixel, int pass,
diff --git a/libavcodec/resample.c b/libavcodec/resample.c
index ea5c6d61c8..f4d6a0aae7 100644
--- a/libavcodec/resample.c
+++ b/libavcodec/resample.c
@@ -1,5 +1,5 @@
/*
- * Sample rate convertion for both audio and video
+ * samplerate conversion for both audio and video
* Copyright (c) 2000 Fabrice Bellard.
*
* This file is part of FFmpeg.
@@ -21,7 +21,7 @@
/**
* @file resample.c
- * Sample rate convertion for both audio and video.
+ * samplerate conversion for both audio and video
*/
#include "avcodec.h"