Merge tag 'LibVNCServer-0.9.11' of https://github.com/LibVNC/libvncserver

Conflicts:
	CMakeLists.txt
	libvncserver/main.c

1 files changed, 3 insertions, 3 deletions

diff --git a/client_examples/vnc2mpg.c b/client_examples/vnc2mpg.c
index 10c3d3e..af4a73a 100644
--- a/client_examples/vnc2mpg.c
+++ b/client_examples/vnc2mpg.c
@@ -85,11 +85,11 @@ AVStream *add_video_stream(AVFormatContext *oc, int codec_id, int w, int h)
     }
     if (c->codec_id == CODEC_ID_MPEG1VIDEO){
         /* needed to avoid using macroblocks in which some coeffs overflow 
-           this doesnt happen with normal video, it just happens here as the 
-           motion of the chroma plane doesnt match the luma plane */
+           this doesn't happen with normal video, it just happens here as the
+           motion of the chroma plane doesn't match the luma plane */
         c->mb_decision=2;
     }
-    /* some formats want stream headers to be seperate */
+    /* some formats want stream headers to be separate */
     if(!strcmp(oc->oformat->name, "mp4") || !strcmp(oc->oformat->name, "mov") || !strcmp(oc->oformat->name, "3gp"))
         c->flags |= CODEC_FLAG_GLOBAL_HEADER;