diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 5ca0c44e380048255f4f275d952d52388cf6bef4..baaed27bee5dde0ce5ebbc520c573141ff0aeb6f 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -914,7 +914,7 @@ ffmpeg -i infile -streamid 0:33 -streamid 1:36 out.ts
 @end example
 
 @item -bsf[:@var{stream_specifier}] @var{bitstream_filters} (@emph{output,per-stream})
-Set bitstream filters for matching streams. @var{bistream_filters} is
+Set bitstream filters for matching streams. @var{bitstream_filters} is
 a comma-separated list of bitstream filters. Use the @code{-bsfs} option
 to get the list of bitstream filters.
 @example
diff --git a/doc/libavcodec.texi b/doc/libavcodec.texi
index 1fd1cf8996871fa9f0619cad16e76ce13974fca5..fe53eb4f75ef76af0a828430a93f4d8077894585 100644
--- a/doc/libavcodec.texi
+++ b/doc/libavcodec.texi
@@ -27,7 +27,7 @@ implementing robust and fast codecs as well as for experimentation.
 
 @c man begin SEEALSO
 ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), ffmpeg-codecs(1),
-ffmpeg-bistream-filters(1), libavutil(3)
+ffmpeg-bitstream-filters(1), libavutil(3)
 @c man end
 
 @c man begin AUTHORS
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 27e1c91cb685ebed68882d1ab92ca2ed4fbb1241..0232aa4c9d716b00cd245cd79917dbdcf7b84c2c 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -709,7 +709,7 @@ retry:
 
     av_assert1(s->bitstream_buffer_size==0);
 frame_end:
-    /* divx 5.01+ bistream reorder stuff */
+    /* divx 5.01+ bitstream reorder stuff */
     if(s->codec_id==AV_CODEC_ID_MPEG4 && s->divx_packed){
         int current_pos= s->gb.buffer == s->bitstream_buffer ? 0 : (get_bits_count(&s->gb)>>3);
         int startcode_found=0;
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 65272525675b531737ab14d5592a612680f9d67d..d91e40af5244213efa4df89b881556b73a2aaae7 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -215,7 +215,7 @@ static int rv34_decode_cbp(GetBitContext *gb, RV34VLC *vlc, int table)
 }
 
 /**
- * Get one coefficient value from the bistream and store it.
+ * Get one coefficient value from the bitstream and store it.
  */
 static inline void decode_coeff(DCTELEM *dst, int coef, int esc, GetBitContext *gb, VLC* vlc, int q)
 {
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c
index 89960d7d0a8d2e78243219338fcae34114aceeb0..0d8335d5c75e9425ebd9f72d393695d21bb379ec 100644
--- a/libavcodec/vda_h264.c
+++ b/libavcodec/vda_h264.c
@@ -285,7 +285,7 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx,
     pthread_mutex_init(&vda_ctx->queue_mutex, NULL);
 #endif
 
-    /* Each VCL NAL in the bistream sent to the decoder
+    /* Each VCL NAL in the bitstream sent to the decoder
      * is preceded by a 4 bytes length header.
      * Change the avcC atom header if needed, to signal headers of 4 bytes. */
     if (extradata_size >= 4 && (extradata[4] & 0x03) != 0x03) {
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 6ee0dd30776c464ecb1f52617712436561dd2a46..e8b7f6c1617c70900b55053413239d0096446a58 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -494,7 +494,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
     } else if (enc->codec_id == AV_CODEC_ID_AAC && pkt->size > 2 &&
                (AV_RB16(pkt->data) & 0xfff0) == 0xfff0) {
         av_log(s, AV_LOG_ERROR, "Malformed AAC bitstream detected: "
-               "use audio bistream filter 'aac_adtstoasc' to fix it "
+               "use audio bitstream filter 'aac_adtstoasc' to fix it "
                "('-bsf:a aac_adtstoasc' option with ffmpeg)\n");
         return AVERROR_INVALIDDATA;
     }
diff --git a/tools/patcheck b/tools/patcheck
index f82787be37c960fd3077cf6baa512c5ef1bb5d26..ca7107f5ebf9ba803a4cd7964fa3d3c7e702fc9e 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|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 '\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|bistream)\b' 'common typos' $*
 
 hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
 hiegrep '[^sn]printf' 'Please use av_log' $*