diff options
author | Timothy Gu <timothygu99@gmail.com> | 2013-06-28 17:24:26 -0700 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-29 02:31:16 +0200 |
commit | a9bbf59be73264ed63b08b67024cd04720dd1f43 (patch) | |
tree | 6f849d011c7a7b801b42dba60358cb5fae185398 /libavformat | |
parent | fc736a99eae194c85fe344a4db895c1cd3493d45 (diff) | |
download | ffmpeg-a9bbf59be73264ed63b08b67024cd04720dd1f43.tar.gz |
cosmetics: Fix "dont" "wont" "doesnt" typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/act.c | 2 | ||||
-rw-r--r-- | libavformat/hls.c | 2 | ||||
-rw-r--r-- | libavformat/movenc.c | 2 | ||||
-rw-r--r-- | libavformat/mpegtsenc.c | 2 | ||||
-rw-r--r-- | libavformat/options_table.h | 4 | ||||
-rw-r--r-- | libavformat/utils.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/act.c b/libavformat/act.c index 78f1d3bb9a..3f223d57b6 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -42,7 +42,7 @@ static int probe(AVProbeData *p) (AV_RL32(&p->buf[16]) != 16)) return 0; - //We cant be sure that this is ACT and not regular WAV + //We can't be sure that this is ACT and not regular WAV if (p->buf_size<512) return 0; diff --git a/libavformat/hls.c b/libavformat/hls.c index 7de6059c5a..95bbd45be6 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -218,7 +218,7 @@ static int parse_playlist(HLSContext *c, const char *url, if (!in) { AVDictionary *opts = NULL; close_in = 1; - /* Some HLS servers dont like being sent the range header */ + /* Some HLS servers don't like being sent the range header */ av_dict_set(&opts, "seekable", "0", 0); // broker prior HTTP options that should be consistent across requests diff --git a/libavformat/movenc.c b/libavformat/movenc.c index cff0760c0e..c18d8af2b6 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -87,7 +87,7 @@ static int64_t update_size(AVIOContext *pb, int64_t pos) static int supports_edts(MOVMuxContext *mov) { - // EDTS with fragments is tricky as we dont know the duration when its written + // EDTS with fragments is tricky as we don't know the duration when its written return (mov->use_editlist<0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) || mov->use_editlist>0; } diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index d92fcb1d73..e7c522c8b9 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -119,7 +119,7 @@ static const AVOption options[] = { // backward compatibility { "resend_headers", "Reemit PAT/PMT before writing the next packet", offsetof(MpegTSWrite, reemit_pat_pmt), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, - { "mpegts_copyts", "dont offset dts/pts", + { "mpegts_copyts", "don't offset dts/pts", offsetof(MpegTSWrite, copyts), AV_OPT_TYPE_INT, {.i64=-1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM}, { NULL }, }; diff --git a/libavformat/options_table.h b/libavformat/options_table.h index 9f8613764c..025554d614 100644 --- a/libavformat/options_table.h +++ b/libavformat/options_table.h @@ -45,7 +45,7 @@ static const AVOption options[]={ {"igndts", "ignore dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_IGNDTS }, INT_MIN, INT_MAX, D, "fflags"}, {"discardcorrupt", "discard corrupted frames", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_DISCARD_CORRUPT }, INT_MIN, INT_MAX, D, "fflags"}, {"sortdts", "try to interleave outputted packets by dts", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_SORT_DTS }, INT_MIN, INT_MAX, D, "fflags"}, -{"keepside", "dont merge side data", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, +{"keepside", "don't merge side data", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_KEEP_SIDE_DATA }, INT_MIN, INT_MAX, D, "fflags"}, {"latm", "enable RTP MP4A-LATM payload", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_MP4A_LATM }, INT_MIN, INT_MAX, E, "fflags"}, {"nobuffer", "reduce the latency introduced by optional buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVFMT_FLAG_NOBUFFER }, 0, INT_MAX, D, "fflags"}, {"seek2any", "forces seeking to enable seek to any mode", OFFSET(seek2any), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, D}, @@ -70,7 +70,7 @@ static const AVOption options[]={ {"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, D, "err_detect"}, {"careful", "consider things that violate the spec and have not been seen in the wild as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CAREFUL }, INT_MIN, INT_MAX, D, "err_detect"}, {"compliant", "consider all spec non compliancies as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT }, INT_MIN, INT_MAX, D, "err_detect"}, -{"aggressive", "consider things that a sane encoder shouldnt do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, D, "err_detect"}, +{"aggressive", "consider things that a sane encoder shouldn't do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE }, INT_MIN, INT_MAX, D, "err_detect"}, {"use_wallclock_as_timestamps", "use wallclock as timestamps", OFFSET(use_wallclock_as_timestamps), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, D}, {"avoid_negative_ts", "shift timestamps to make them positive. 1 enables, 0 disables, default of -1 enables when required by target format.", OFFSET(avoid_negative_ts), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, E}, {"skip_initial_bytes", "skip initial bytes", OFFSET(skip_initial_bytes), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX-1, D}, diff --git a/libavformat/utils.c b/libavformat/utils.c index 71fca24e6e..67fb97ce60 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -805,7 +805,7 @@ static int is_intra_only(AVCodecContext *enc){ static int has_decode_delay_been_guessed(AVStream *st) { if(st->codec->codec_id != AV_CODEC_ID_H264) return 1; - if(!st->info) // if we have left find_stream_info then nb_decoded_frames wont increase anymore for stream copy + if(!st->info) // if we have left find_stream_info then nb_decoded_frames won't increase anymore for stream copy return 1; #if CONFIG_H264_DECODER if(st->codec->has_b_frames && |