Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'

[ffmpeg] / libavcodec / h264_mb.c

diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index c9fdf7a71f5f317b03f0e23157ac48e102c7ef18..e33a59e4ca70cd2f1738483c54b12ab0b47f40c5 100644 (file)
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -21,7 +21,7 @@
 
 /**
  * @file
- * H.264 / AVC / MPEG4 part10 macroblock decoding
+ * H.264 / AVC / MPEG-4 part10 macroblock decoding
  */
 
 #include <stdint.h>
@@ -90,7 +90,7 @@ static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl,
 /**
  * Wait until all reference frames are available for MC operations.
  *
- * @param h the H264 context
+ * @param h the H.264 context
  */
 static void await_references(const H264Context *h, H264SliceContext *sl)
 {