Merge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89'

[ffmpeg] / doc / codecs.texi

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 4105e09998e533078084202a2fc752bcf33bca34..3c035a5ecb31b443fc0f3b900908b7c4ecc8d0d8 100644 (file)
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -495,6 +495,8 @@ visualize block types
 picture buffer allocations
 @item thread_ops
 threading operations
+@item nomc
+skip motion compensation
 @end table
 
 @item vismv @var{integer} (@emph{decoding,video})
@@ -863,6 +865,14 @@ Possible values:
 
 @item mpeg2_aac_he
 
+@item mpeg4_sp
+
+@item mpeg4_core
+
+@item mpeg4_main
+
+@item mpeg4_asp
+
 @item dts
 
 @item dts_es