diff options
author | Lou Logan <lou@lrcd.com> | 2014-06-02 18:46:04 -0800 |
---|---|---|
committer | Lou Logan <lou@lrcd.com> | 2014-06-03 10:58:19 -0800 |
commit | 88f2586adbcdcb350b2923a82bcb07c5a519bd1d (patch) | |
tree | d4c93e604c90148368ae9c3327be9839c33f3c27 /libavcodec | |
parent | 137c5e115b0f1bff1867a3a09f3a2f14cfda2fb5 (diff) | |
download | ffmpeg-88f2586adbcdcb350b2923a82bcb07c5a519bd1d.tar.gz |
fix various typos
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/aacdec.c | 2 | ||||
-rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
-rw-r--r-- | libavcodec/dcadec.c | 2 | ||||
-rw-r--r-- | libavcodec/dcaenc.c | 2 | ||||
-rw-r--r-- | libavcodec/diracdec.c | 4 | ||||
-rw-r--r-- | libavcodec/indeo5.c | 2 | ||||
-rw-r--r-- | libavcodec/jpeg2000.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index a8f76e73e1..10c509be82 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1946,7 +1946,7 @@ static int decode_ics(AACContext *ac, SingleChannelElement *sce, avpriv_request_sample(ac->avctx, "SSR"); return AVERROR_PATCHWELCOME; } - // I see no textual basis in the spec for this occuring after SSR gain + // I see no textual basis in the spec for this occurring after SSR gain // control, but this is what both reference and real implmentations do if (tns->present && er_syntax) if (decode_tns(ac, tns, gb, ics) < 0) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d52f245060..d1f67bbf70 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -575,7 +575,7 @@ typedef struct AVCodecDescriptor { /** * MIME type(s) associated with the codec. * May be NULL; if not, a NULL-terminated array of MIME types. - * The first item is always non-NULL and is the prefered MIME type. + * The first item is always non-NULL and is the preferred MIME type. */ const char *const *mime_types; } AVCodecDescriptor; @@ -4957,7 +4957,7 @@ AVBitStreamFilterContext *av_bitstream_filter_init(const char *name); * @return >= 0 in case of success, or a negative error code in case of failure * * If the return value is positive, an output buffer is allocated and - * is availble in *poutbuf, and is distinct from the input buffer. + * is available in *poutbuf, and is distinct from the input buffer. * * If the return value is 0, the output buffer is not allocated and * should be considered identical to the input buffer, or in case diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index bfbf51a128..e23155ca4f 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2423,7 +2423,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } - /* make sure that we have managed to get equivelant dts/avcodec channel + /* make sure that we have managed to get equivalent dts/avcodec channel * masks in some sense -- unfortunately some channels could overlap */ if (av_popcount(channel_mask) != av_popcount(channel_layout)) { av_log(avctx, AV_LOG_DEBUG, diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 8d0655ddcf..905cdc9ade 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -868,7 +868,7 @@ static void put_subframe(DCAContext *c, int subframe) for (band = 0; band < DCA_SUBBANDS; band++) put_bits(&c->pb, 1, 0); - /* Prediction VQ addres: not transmitted */ + /* Prediction VQ address: not transmitted */ /* Bit allocation index */ for (ch = 0; ch < c->fullband_channels; ch++) for (band = 0; band < DCA_SUBBANDS; band++) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 24c540e314..d7cca7e0da 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -199,7 +199,7 @@ typedef struct DiracContext { uint8_t *edge_emu_buffer[4]; uint8_t *edge_emu_buffer_base; - uint16_t *mctmp; /* buffer holding the MC data multipled by OBMC weights */ + uint16_t *mctmp; /* buffer holding the MC data multiplied by OBMC weights */ uint8_t *mcscratch; int buffer_stride; @@ -694,7 +694,7 @@ static void lowdelay_subband(DiracContext *s, GetBitContext *gb, int quant, IDWTELEM *buf1 = b1->ibuf + top * b1->stride; IDWTELEM *buf2 = b2 ? b2->ibuf + top * b2->stride : NULL; int x, y; - /* we have to constantly check for overread since the spec explictly + /* we have to constantly check for overread since the spec explicitly requires this, with the meaning that all remaining coeffs are set to 0 */ if (get_bits_count(gb) >= bits_end) return; diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 0477c97739..a556fc787e 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -335,7 +335,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) } if (ctx->frame_type == FRAMETYPE_INTER_SCAL && !ctx->is_scalable) { - av_log(avctx, AV_LOG_ERROR, "Scalable inter frame in non scaleable stream\n"); + av_log(avctx, AV_LOG_ERROR, "Scalable inter frame in non scalable stream\n"); ctx->frame_type = FRAMETYPE_INTER; return AVERROR_INVALIDDATA; } diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index f3658c2c84..3762a9bb4b 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -249,7 +249,7 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, else reslevel->nbands = 3; - /* Number of precincts wich span the tile for resolution level reslevelno + /* Number of precincts which span the tile for resolution level reslevelno * see B.6 in ISO/IEC 15444-1:2002 eq. B-16 * num_precincts_x = |- trx_1 / 2 ^ log2_prec_width) -| - (trx_0 / 2 ^ log2_prec_width) * num_precincts_y = |- try_1 / 2 ^ log2_prec_width) -| - (try_0 / 2 ^ log2_prec_width) |