summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-07-24 21:12:37 +0000
committerDiego Biurrun <diego@biurrun.de>2008-07-24 21:12:37 +0000
commite16190fa7ae2aeaaa7e08e9562fc6701299e9ed1 (patch)
tree4796e37ed4333f16dd68f318e8b16cecc35dfa26
parent3a459ebe352cae3cb61010e57dc4aaa713830695 (diff)
cosmetics: typo fixes
Originally committed as revision 14376 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
-rw-r--r--ffserver.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index f972a6f823..57ec83fc1c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2235,7 +2235,7 @@ static int opt_default(const char *opt, const char *arg){
// av_log(NULL, AV_LOG_ERROR, "%s:%s: %f 0x%0X\n", opt, arg, av_get_double(avctx_opts, opt, NULL), (int)av_get_int(avctx_opts, opt, NULL));
- //FIXME we should always use avctx_opts, ... for storing options so there wont be any need to keep track of whats set over this
+ //FIXME we should always use avctx_opts, ... for storing options so there will not be any need to keep track of what i set over this
opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1));
opt_names[opt_name_count++]= o->name;
diff --git a/ffserver.c b/ffserver.c
index bc282c9f4c..ccb5c0ab5c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1497,9 +1497,8 @@ static int http_parse_request(HTTPContext *c)
if (c->post) {
/* if post, it means a feed is being sent */
if (!stream->is_feed) {
- /* However it might be a status report from WMP! Lets log the data
- * as it might come in handy one day
- */
+ /* However it might be a status report from WMP! Let us log the
+ * data as it might come in handy one day. */
char *logline = 0;
int client_id = 0;