summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h10
-rw-r--r--libavformat/avio.h6
-rw-r--r--libavformat/movenc.c2
-rw-r--r--libavformat/utils.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index cb9b8b83c8..e2449f5cda 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -259,7 +259,7 @@ typedef struct AVIndexEntry {
int64_t timestamp;
#define AVINDEX_KEYFRAME 0x0001
int flags:2;
- int size:30; //yeah trying to keep the size of this small to reduce memory requirements (its 24 vs 32 byte due to possible 8byte align)
+ int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs 32 byte due to possible 8byte align).
int min_distance; /**< min distance between this and the previous keyframe, used to avoid unneeded searching */
} AVIndexEntry;
@@ -720,10 +720,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt);
*
* The packet must contain one audio or video frame.
* If the packets are already correctly interleaved the application should
- * call av_write_frame() instead as it is slightly faster, it is also important
- * to keep in mind that completly non interleaved input will need huge amounts
- * of memory to interleave with this, so its prefereable to interleave at the
- * demuxer level
+ * call av_write_frame() instead as it is slightly faster. It is also important
+ * to keep in mind that completely non-interleaved input will need huge amounts
+ * of memory to interleave with this, so it is preferable to interleave at the
+ * demuxer level.
*
* @param s media file handle
* @param pkt the packet, which contains the stream_index, buf/buf_size, dts/pts, ...
diff --git a/libavformat/avio.h b/libavformat/avio.h
index be78c9a7b4..8e04545e28 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -85,9 +85,9 @@ void url_set_interrupt_cb(URLInterruptCB *interrupt_cb);
int url_poll(URLPollEntry *poll_table, int n, int timeout);
/**
- * passing this as the "whence" parameter to a seek function causes it to
- * return the filesize without seeking anywhere, supporting this is optional
- * if its not supprted then the seek function will return <0
+ * Passing this as the "whence" parameter to a seek function causes it to
+ * return the filesize without seeking anywhere. Supporting this is optional.
+ * If it is not supported then the seek function will return <0.
*/
#define AVSEEK_SIZE 0x10000
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index a8ab8f9063..2022bf20ed 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -78,7 +78,7 @@ typedef struct MOVContext {
MOVTrack tracks[MAX_STREAMS];
} MOVContext;
-//FIXME supprt 64bit varaint with wide placeholders
+//FIXME support 64 bit variant with wide placeholders
static offset_t updateSize (ByteIOContext *pb, offset_t pos)
{
offset_t curpos = url_ftell(pb);
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 0fa5d8d502..0609ff3d7a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -423,7 +423,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
must_open_file = 1;
if (fmt && (fmt->flags & AVFMT_NOFILE)) {
must_open_file = 0;
- pb= NULL; //FIXME this or memset(pb, 0, sizeof(ByteIOContext)); otherwise its uninitalized
+ pb= NULL; //FIXME this or memset(pb, 0, sizeof(ByteIOContext)); otherwise it is uninitialized
}
if (!fmt || must_open_file) {
@@ -1098,7 +1098,7 @@ int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts
ts_max=
ts_min= AV_NOPTS_VALUE;
- pos_limit= -1; //gcc falsely says it may be uninitalized
+ pos_limit= -1; //gcc falsely says it may be uninitialized
st= s->streams[stream_index];
if(st->index_entries){