diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio_internal.h | 2 | ||||
| -rw-r--r-- | libavformat/brstm.c | 2 | ||||
| -rw-r--r-- | libavformat/ffmdec.c | 2 | ||||
| -rw-r--r-- | libavformat/hevc.c | 2 | ||||
| -rw-r--r-- | libavformat/mpeg.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index f4bc39c600..bb2512707a 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -93,7 +93,7 @@ int ffio_set_buf_size(AVIOContext *s, int buf_size); * * Will ensure that when reading sequentially up to buf_size, seeking * within the current pos and pos+buf_size is possible. - * Once the stream position moves outside this window this gurantee is lost. + * Once the stream position moves outside this window this guarantee is lost. */ int ffio_ensure_seekback(AVIOContext *s, int buf_size); diff --git a/libavformat/brstm.c b/libavformat/brstm.c index 7781b3c559..8e4dae6f05 100644 --- a/libavformat/brstm.c +++ b/libavformat/brstm.c @@ -200,7 +200,7 @@ static int read_header(AVFormatContext *s) goto fail; } if (b->adpc) { - av_log(s, AV_LOG_WARNING, "skipping additonal ADPC chunk\n"); + av_log(s, AV_LOG_WARNING, "skipping additional ADPC chunk\n"); goto skip; } else { b->adpc = av_mallocz(asize); diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 9d89b16643..d296ca7ebc 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -510,7 +510,7 @@ static int ffm_read_packet(AVFormatContext *s, AVPacket *pkt) if (ffm_read_data(s, ffm->header+16, 4, 1) != 4) return -1; ffm->read_state = READ_DATA; - /* fall thru */ + /* fall through */ case READ_DATA: size = AV_RB24(ffm->header + 2); if ((ret = ffm_is_avail_data(s, size)) < 0) diff --git a/libavformat/hevc.c b/libavformat/hevc.c index 9632386153..45b00c45bc 100644 --- a/libavformat/hevc.c +++ b/libavformat/hevc.c @@ -799,7 +799,7 @@ static void hvcc_init(HEVCDecoderConfigurationRecord *hvcc) /* * Initialize this field with an invalid value which can be used to detect - * whether we didn't see any VUI (in wich case it should be reset to zero). + * whether we didn't see any VUI (in which case it should be reset to zero). */ hvcc->min_spatial_segmentation_idc = MAX_SPATIAL_SEGMENTATION + 1; } diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 472a488173..c53bab3e3c 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -464,7 +464,7 @@ static int mpegps_read_packet(AVFormatContext *s, MpegDemuxContext *m = s->priv_data; AVStream *st; int len, startcode, i, es_type, ret; - int lpcm_header_len = -1; //Init to supress warning + int lpcm_header_len = -1; //Init to suppress warning int request_probe= 0; enum AVCodecID codec_id = AV_CODEC_ID_NONE; enum AVMediaType type; |