summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-10-05 14:12:42 +0200
committerDiego Biurrun <diego@biurrun.de>2011-12-11 00:32:25 +0100
commitda9cea77e314dad2fbc615a76085a0c330741f92 (patch)
tree7ddbdbf1749d1ee7c66c83f76f66bd50367b246d /libavcodec/avcodec.h
parent2e87b4c51152e0241cae7f655d53920029a0e632 (diff)
downloadffmpeg-da9cea77e314dad2fbc615a76085a0c330741f92.tar.gz
Fix a bunch of common typos.
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 669afe80ba..ae5ce6e314 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1274,7 +1274,7 @@ typedef struct AVCodecContext {
* Some codecs need additional format info. It is stored here.
* If any muxer uses this then ALL demuxers/parsers AND encoders for the
* specific codec MUST set it correctly otherwise stream copy breaks.
- * In general use of this field by muxers is not recommanded.
+ * In general use of this field by muxers is not recommended.
* - encoding: Set by libavcodec.
* - decoding: Set by libavcodec. (FIXME: Is this OK?)
*/
@@ -3444,7 +3444,7 @@ typedef struct ReSampleContext ReSampleContext;
* @param linear if 1 then the used FIR filter will be linearly interpolated
between the 2 closest, if 0 the closest will be used
* @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occured
+ * @return allocated ReSampleContext, NULL if error occurred
*/
ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
int output_rate, int input_rate,