aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-09-25 07:42:32 +0200
committerClément Bœsch <ubitux@gmail.com>2012-09-25 07:42:32 +0200
commit4390f8c28daab9ac9f2c7b9164bdb79b3689d484 (patch)
tree9565d11ffbd7cfd49e403cdb2571b12e57d6f53a
parentaea15df3b4c264b5b13d5f85341f52c7ec756c6f (diff)
downloadffmpeg-4390f8c28daab9ac9f2c7b9164bdb79b3689d484.tar.gz
Fix two "skiping" typo.
-rw-r--r--ffmpeg.c2
-rw-r--r--libavformat/utils.c2
-rwxr-xr-xtools/patcheck2
3 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index a30ffb19aa..b74c1121cc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -821,7 +821,7 @@ static void do_video_out(AVFormatContext *s,
return;
} else if (nb_frames > 1) {
if (nb_frames > dts_error_threshold * 30) {
- av_log(NULL, AV_LOG_ERROR, "%d frame duplication too large, skiping\n", nb_frames - 1);
+ av_log(NULL, AV_LOG_ERROR, "%d frame duplication too large, skipping\n", nb_frames - 1);
nb_frames_drop++;
return;
}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 0eda2aeec6..a48369fdfb 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -646,7 +646,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
if((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0)
goto fail;
} else
- av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skiping\n");
+ av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n");
}
ff_id3v2_free_extra_meta(&id3v2_extra_meta);
diff --git a/tools/patcheck b/tools/patcheck
index 80073aead9..f82787be37 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|ouput|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive|funtions|overriden|outputing|seperation|initalize|compatibilty)\b' 'common typos' $*
+hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|skiping|heigth|informations|colums|loosy|loosing|ouput|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention|acheive|funtions|overriden|outputing|seperation|initalize|compatibilty)\b' 'common typos' $*
hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
hiegrep '[^sn]printf' 'Please use av_log' $*