summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2005-04-24 17:21:11 +0000
committerMike Melanson <mike@multimedia.cx>2005-04-24 17:21:11 +0000
commit160d679c075e9f575f96ea2c2c000545a49916a0 (patch)
tree5254d6f53383d530989b1fa99e72f6da3a391b27 /libavformat
parent93ccc14df57008117631e369ba2e846ef4950a16 (diff)
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asf.c2
-rw-r--r--libavformat/dc1394.c2
-rw-r--r--libavformat/nut.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c
index cda6f2bb93..d88a840ee9 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -579,7 +579,7 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
asf_st->frag_offset = 0;
if (asf->packet_frag_offset != 0) {
url_fskip(pb, asf->packet_frag_size);
- av_log(s, AV_LOG_INFO, "ff asf parser skiping %db\n", asf->packet_frag_size);
+ av_log(s, AV_LOG_INFO, "ff asf parser skipping %db\n", asf->packet_frag_size);
asf->packet_size_left -= asf->packet_frag_size;
continue;
}
diff --git a/libavformat/dc1394.c b/libavformat/dc1394.c
index 2aba671da1..513205214b 100644
--- a/libavformat/dc1394.c
+++ b/libavformat/dc1394.c
@@ -102,7 +102,7 @@ static int dc1394_read_header(AVFormatContext *c, AVFormatParameters * ap)
/* Now lets prep the hardware */
dc1394->handle = dc1394_create_handle(0); /* FIXME: gotta have ap->port */
if (!dc1394->handle) {
- av_log(c, AV_LOG_ERROR, "Can't aquire dc1394 handle on port %d\n", 0 /* ap->port */);
+ av_log(c, AV_LOG_ERROR, "Can't acquire dc1394 handle on port %d\n", 0 /* ap->port */);
goto out;
}
camera_nodes = dc1394_get_camera_nodes(dc1394->handle, &res, 1);
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 3a83d4f6b3..89a6aa720f 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -931,7 +931,7 @@ static int decode_main_header(NUTContext *nut){
}
if(check_checksum(bc)){
- av_log(s, AV_LOG_ERROR, "Main header checksum missmatch\n");
+ av_log(s, AV_LOG_ERROR, "Main header checksum mismatch\n");
return -1;
}
@@ -1012,7 +1012,7 @@ static int decode_stream_header(NUTContext *nut){
st->codec.channels = get_v(bc);
}
if(check_checksum(bc)){
- av_log(s, AV_LOG_ERROR, "Stream header %d checksum missmatch\n", stream_id);
+ av_log(s, AV_LOG_ERROR, "Stream header %d checksum mismatch\n", stream_id);
return -1;
}
av_set_pts_info(s->streams[stream_id], 60, denom, nom);
@@ -1067,7 +1067,7 @@ static int decode_info_header(NUTContext *nut){
}
}
if(check_checksum(bc)){
- av_log(s, AV_LOG_ERROR, "Info header checksum missmatch\n");
+ av_log(s, AV_LOG_ERROR, "Info header checksum mismatch\n");
return -1;
}
return 0;