# HG changeset patch # User melanson # Date 1114363271 0 # Node ID 72f8690c3f3784cd4476a50265da63929932f9db # Parent 909942162fa3b222b2a1f27fccc7201cea6e7f29 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped") diff -r 909942162fa3 -r 72f8690c3f37 asf.c --- a/asf.c Sun Apr 24 11:15:35 2005 +0000 +++ b/asf.c Sun Apr 24 17:21:11 2005 +0000 @@ -579,7 +579,7 @@ 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 -r 909942162fa3 -r 72f8690c3f37 dc1394.c --- a/dc1394.c Sun Apr 24 11:15:35 2005 +0000 +++ b/dc1394.c Sun Apr 24 17:21:11 2005 +0000 @@ -102,7 +102,7 @@ /* 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 -r 909942162fa3 -r 72f8690c3f37 nut.c --- a/nut.c Sun Apr 24 11:15:35 2005 +0000 +++ b/nut.c Sun Apr 24 17:21:11 2005 +0000 @@ -931,7 +931,7 @@ } 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 @@ 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 @@ } } 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;