diff --git a/ffmpeg.c b/ffmpeg.c
index f972a6f823cda5dcbc3cf90deaddc1cc05476cad..57ec83fc1c1c58afa2d5ee04582ff86c50b02033 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 bc282c9f4c87797cbcb68743d9ba2d70019a751e..ccb5c0ab5c310473a77d069a7a5324e00e45362e 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;