aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-12-18 02:46:42 +0100
committerClément Bœsch <ubitux@gmail.com>2012-12-18 02:47:34 +0100
commit8b63744f483e1f5a5d4f439fc1bbd858232ed581 (patch)
tree26645dc06617d696882fc784ed48df55731f8df3
parent1dd33d472a608daba459b628c170e89d796f1795 (diff)
downloadffmpeg-8b63744f483e1f5a5d4f439fc1bbd858232ed581.tar.gz
Fix "bistream" typo and add a check in tools/patcheck.
-rw-r--r--doc/ffmpeg.texi2
-rw-r--r--doc/libavcodec.texi2
-rw-r--r--libavcodec/h263dec.c2
-rw-r--r--libavcodec/rv34.c2
-rw-r--r--libavcodec/vda_h264.c2
-rw-r--r--libavformat/flvenc.c2
-rwxr-xr-xtools/patcheck2
7 files changed, 7 insertions, 7 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 5ca0c44e38..baaed27bee 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 1fd1cf8996..fe53eb4f75 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 27e1c91cb6..0232aa4c9d 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 6527252567..d91e40af52 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 89960d7d0a..0d8335d5c7 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 6ee0dd3077..e8b7f6c161 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 f82787be37..ca7107f5eb 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' $*