# HG changeset patch
# User diego
# Date 1184677070 0
# Node ID 45d083bbbbe7c4335a2912c7aaab77da184e23f0
# Parent  dfa6e7fa2bacdddaa93d2ae13fec8d84d603a2c5
typo fixes

diff -r dfa6e7fa2bac -r 45d083bbbbe7 imgconvert.c
--- a/imgconvert.c	Tue Jul 17 12:33:14 2007 +0000
+++ b/imgconvert.c	Tue Jul 17 12:57:50 2007 +0000
@@ -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 @@
                     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 -r dfa6e7fa2bac -r 45d083bbbbe7 imgconvert_template.h
--- a/imgconvert_template.h	Tue Jul 17 12:33:14 2007 +0000
+++ b/imgconvert_template.h	Tue Jul 17 12:57:50 2007 +0000
@@ -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 -r dfa6e7fa2bac -r 45d083bbbbe7 pngdec.c
--- a/pngdec.c	Tue Jul 17 12:33:14 2007 +0000
+++ b/pngdec.c	Tue Jul 17 12:57:50 2007 +0000
@@ -72,7 +72,7 @@
 };
 
 /* 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 -r dfa6e7fa2bac -r 45d083bbbbe7 resample.c
--- a/resample.c	Tue Jul 17 12:33:14 2007 +0000
+++ b/resample.c	Tue Jul 17 12:57:50 2007 +0000
@@ -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"