summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-08-21 01:02:13 +0200
committerDiego Biurrun <diego@biurrun.de>2013-05-03 18:26:12 +0200
commita5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 (patch)
treef04a20b097c813143cf259c8001cc707fc6024d9 /libavformat
parent4a7af92cc80ced8498626401ed21f25ffe6740c8 (diff)
silly typo fixes
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h6
-rw-r--r--libavformat/idcin.c2
-rw-r--r--libavformat/pmpdec.c2
-rw-r--r--libavformat/utils.c6
-rw-r--r--libavformat/wavdec.c6
5 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 2512e36020..43afa9f526 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -353,8 +353,8 @@ typedef struct AVProbeData {
#define AVFMT_VARIABLE_FPS 0x0400 /**< Format allows variable fps. */
#define AVFMT_NODIMENSIONS 0x0800 /**< Format does not need width/height */
#define AVFMT_NOSTREAMS 0x1000 /**< Format does not require any streams */
-#define AVFMT_NOBINSEARCH 0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
-#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */
+#define AVFMT_NOBINSEARCH 0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fall back on generic search */
#define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */
#define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly
@@ -1388,7 +1388,7 @@ void avformat_close_input(AVFormatContext **s);
*
* @param s Media file handle, must be allocated with avformat_alloc_context().
* Its oformat field must be set to the desired output format;
- * Its pb field must be set to an already openened AVIOContext.
+ * Its pb field must be set to an already opened AVIOContext.
* @param options An AVDictionary filled with AVFormatContext and muxer-private options.
* On return this parameter will be destroyed and replaced with a dict containing
* options that were not found. May be NULL.
diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index 536e6ee6ff..fa9976bae6 100644
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -136,7 +136,7 @@ static int idcin_probe(AVProbeData *p)
if (number > 2)
return 0;
- /* return half certainly since this check is a bit sketchy */
+ /* return half certainty since this check is a bit sketchy */
return AVPROBE_SCORE_MAX / 2;
}
diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c
index 6cdce107c4..484be43ce9 100644
--- a/libavformat/pmpdec.c
+++ b/libavformat/pmpdec.c
@@ -157,7 +157,7 @@ static int pmp_seek(AVFormatContext *s, int stream_idx, int64_t ts, int flags)
{
PMPContext *pmp = s->priv_data;
pmp->cur_stream = 0;
- // fallback to default seek now
+ // fall back on default seek now
return -1;
}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 89eb759bc9..e1acb254b6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -722,7 +722,7 @@ int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux)
if ((frame_size = av_get_audio_frame_duration(enc, size)) > 0)
return frame_size;
- /* fallback to using frame_size if muxing */
+ /* Fall back on using frame_size if muxing. */
if (enc->frame_size > 1)
return enc->frame_size;
@@ -1790,8 +1790,8 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int
//try to seek via read_timestamp()
}
- //Fallback to old API if new is not implemented but old is
- //Note the old has somewat different sematics
+ // Fall back on old API if new is not implemented but old is.
+ // Note the old API has somewhat different semantics.
if(s->iformat->read_seek || 1)
return av_seek_frame(s, stream_index, ts, flags | ((uint64_t)ts - min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0));
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 1b427117ba..07df9232d7 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -73,9 +73,9 @@ static int wav_probe(AVProbeData *p)
return 0;
if (!memcmp(p->buf + 8, "WAVE", 4)) {
if (!memcmp(p->buf, "RIFF", 4))
- /* Since ACT demuxer has standard WAV header at top of it's
- * own, returning score is decreased to avoid probe conflict
- * between ACT and WAV. */
+ /* Since the ACT demuxer has a standard WAV header at the top of
+ * its own, the returned score is decreased to avoid a probe
+ * conflict between ACT and WAV. */
return AVPROBE_SCORE_MAX - 1;
else if (!memcmp(p->buf, "RF64", 4) &&
!memcmp(p->buf + 12, "ds64", 4))