summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aacpsy.c3
-rw-r--r--libavcodec/flac_parser.c2
-rw-r--r--libavcodec/flacenc.c2
-rw-r--r--libavcodec/flicvideo.c2
-rw-r--r--libavcodec/wmavoice.c2
-rw-r--r--libavcodec/x86/fpel_mmx.c2
6 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index b3513c7639..4d4fb54e09 100644
--- a/libavcodec/aacpsy.c
+++ b/libavcodec/aacpsy.c
@@ -603,7 +603,8 @@ static void psy_hp_filter(const float *firbuf, float *hpfsmpl, const float *psy_
sum1 += psy_fir_coeffs[j] * (firbuf[i + j] + firbuf[i + PSY_LAME_FIR_LEN - j]);
sum2 += psy_fir_coeffs[j + 1] * (firbuf[i + j + 1] + firbuf[i + PSY_LAME_FIR_LEN - j - 1]);
}
- /* NOTE: The LAME psymodel expects it's input in the range -32768 to 32768. Tuning this for normalized floats would be difficult. */
+ /* NOTE: The LAME psymodel expects it's input in the range -32768 to 32768.
+ * Tuning this for normalized floats would be difficult. */
hpfsmpl[i] = (sum1 + sum2) * 32768.0f;
}
}
diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
index e2c6744d78..f4184a1878 100644
--- a/libavcodec/flac_parser.c
+++ b/libavcodec/flac_parser.c
@@ -27,7 +27,7 @@
* Each time it finds and verifies a CRC-8 header it sees which of the
* FLAC_MAX_SEQUENTIAL_HEADERS that came before it have a valid CRC-16 footer
* that ends at the newly found header.
- * Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of it's crc-verified
+ * Headers are scored by FLAC_HEADER_BASE_SCORE plus the max of its crc-verified
* children, penalized by changes in sample rate, frame number, etc.
* The parser returns the frame with the highest score.
**/
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index dc932c6e68..1e9cc48b99 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1259,7 +1259,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
frame_bytes = encode_frame(s);
- /* fallback to verbatim mode if the compressed frame is larger than it
+ /* Fall back on verbatim mode if the compressed frame is larger than it
would be if encoded uncompressed. */
if (frame_bytes < 0 || frame_bytes > s->max_framesize) {
s->frame.verbatim_only = 1;
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 90885fc0d5..a2f9ef99e5 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -593,7 +593,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
break;
case FLI_LC:
- av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-paletised FLC\n");
+ av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-palettized FLC\n");
bytestream2_skip(&g2, chunk_size - 6);
break;
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 19f8965a48..1bf2497667 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -605,7 +605,7 @@ static void calc_input_response(WMAVoiceContext *s, float *lpcs,
/* 70.57 =~ 1/log10(1.0331663) */
idx = (pwr * gain_mul - 0.0295) * 70.570526123;
- if (idx > 127) { // fallback if index falls outside table range
+ if (idx > 127) { // fall back if index falls outside table range
coeffs[n] = wmavoice_energy_table[127] *
powf(1.0331663, idx - 127);
} else
diff --git a/libavcodec/x86/fpel_mmx.c b/libavcodec/x86/fpel_mmx.c
index 9d3f36b6c8..9884c7d93a 100644
--- a/libavcodec/x86/fpel_mmx.c
+++ b/libavcodec/x86/fpel_mmx.c
@@ -29,7 +29,7 @@
#if HAVE_MMX_INLINE
-// in case more speed is needed - unroling would certainly help
+// in case more speed is needed - unrolling would certainly help
void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h)
{