Merge commit '07377fb557909015338b4c215b87b9c73ea577ad'

[ffmpeg] / libavcodec / h263.c

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 800387d1c741661f781993cd38839fddb1a97441..4720c568ee97afe97b4de4ca6f83155f704d398f 100644 (file)
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -1,7 +1,7 @@
 /*
- * H263/MPEG4 backend for encoder and decoder
+ * H.263/MPEG-4 backend for encoder and decoder
  * Copyright (c) 2000,2001 Fabrice Bellard
- * H263+ support.
+ * H.263+ support.
  * Copyright (c) 2001 Juan J. Sierralta P
  * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
  *
@@ -24,7 +24,7 @@
 
 /**
  * @file
- * h263/mpeg4 codec.
+ * H.263/MPEG-4 codec.
  */
 
 #include <limits.h>
@@ -320,7 +320,7 @@ int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
     A = mot_val[ - 1];
     /* special case for first (slice) line */
     if (s->first_slice_line && block<3) {
-        // we can't just change some MVs to simulate that as we need them for the B frames (and ME)
+        // we can't just change some MVs to simulate that as we need them for the B-frames (and ME)
         // and if we ever support non rectangular objects than we need to do a few ifs here anyway :(
         if(block==0){ //most common case
             if(s->mb_x  == s->resync_mb_x){ //rare