aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-01-26 23:03:35 +0100
committerClément Bœsch <ubitux@gmail.com>2012-01-28 11:04:19 +0100
commit23b639c44f88099fe05c51d51993970b7a6fce9a (patch)
tree2143e3da2b9620f8658fbfc9ffe8afbf543ea4d7
parent81ab42a334c3f7b7e23a259382fbd81384656c44 (diff)
downloadffmpeg-23b639c44f88099fe05c51d51993970b7a6fce9a.tar.gz
Fix "ouput" typo and add a check.
-rw-r--r--Changelog2
-rw-r--r--doc/ffmpeg.txt2
-rw-r--r--libavcodec/qtrleenc.c2
-rw-r--r--libavcodec/rl2.c2
-rw-r--r--libavfilter/libmpcodecs/vf_framestep.c2
-rwxr-xr-xtools/patcheck2
6 files changed, 6 insertions, 6 deletions
diff --git a/Changelog b/Changelog
index 5d4828b6ff..b62b851fb3 100644
--- a/Changelog
+++ b/Changelog
@@ -744,7 +744,7 @@ version 0.4.5:
- MPEG-4 vol header fixes (Jonathan Marsden <snmjbm at pacbell.net>)
- ARM optimizations (Lionel Ulmer <lionel.ulmer at free.fr>).
- Windows porting of file converter
-- added MJPEG raw format (input/ouput)
+- added MJPEG raw format (input/output)
- added JPEG image format support (input/output)
diff --git a/doc/ffmpeg.txt b/doc/ffmpeg.txt
index 1fa42e78ee..a028ca23d2 100644
--- a/doc/ffmpeg.txt
+++ b/doc/ffmpeg.txt
@@ -29,7 +29,7 @@
\ / :
+======\======================/======+ ^ :
------> 0 | : source_index : st-:--- | : :
- OuputFile output_files[] / +------------------------------------+ : :
+ OutputFile output_files[] / +------------------------------------+ : :
/ 1 | : : : | : :
^ +------+------------+-----+ / +------------------------------------+ : :
: | : ost_index -:-----:------/ 2 | : : : | : :
diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index 0e10c76365..a8963ab78a 100644
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -205,7 +205,7 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t
prev_line -= s->pixel_size;
}
- /* Good ! Now we have the best sequence for this line, let's ouput it */
+ /* Good ! Now we have the best sequence for this line, let's output it */
/* We do a special case for the first pixel so that we avoid testing it in
* the whole loop */
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index 0090bf3093..07c6109c64 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -51,7 +51,7 @@ typedef struct Rl2Context {
* @param s rl2 context
* @param in input buffer
* @param size input buffer size
- * @param out ouput buffer
+ * @param out output buffer
* @param stride stride of the output buffer
* @param video_base offset of the rle data inside the frame
*/
diff --git a/libavfilter/libmpcodecs/vf_framestep.c b/libavfilter/libmpcodecs/vf_framestep.c
index cdf5386670..701e6afba4 100644
--- a/libavfilter/libmpcodecs/vf_framestep.c
+++ b/libavfilter/libmpcodecs/vf_framestep.c
@@ -1,5 +1,5 @@
/*
- * filter to ouput only 1 every n frame, or only the I (key)frame
+ * filter to output only 1 every n frame, or only the I (key)frame
*
* The parameters are:
*
diff --git a/tools/patcheck b/tools/patcheck
index 35c0ee3822..c5506e6de5 100755
--- a/tools/patcheck
+++ b/tools/patcheck
@@ -67,7 +67,7 @@ $EGREP $OPT '^\+ *(const *|)static' $*| $EGREP --color=always '[^=]= *(0|NULL)[^
cat $TMP
hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*
-hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible)\b' 'common typos' $*
+hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|ouput|seperate|preceed|upto|paket|posible)\b' 'common typos' $*
hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
hiegrep '[^sn]printf' 'Please use av_log' $*