Merge commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad'

[ffmpeg] / doc / general.texi

diff --git a/doc/general.texi b/doc/general.texi
index 2b782e0f56460493f42790882710501d5c15fe9b..99ba88a34ce5a16fc78ae60a86f88d46e97039e2 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -463,6 +463,7 @@ library:
 @item Redirector                @tab   @tab X
 @item RedSpark                  @tab   @tab X
 @item Renderware TeXture Dictionary @tab   @tab X
+@item Resolume DXV              @tab   @tab X
 @item RL2                       @tab   @tab X
     @tab Audio and video format used in some games by Entertainment Software Partners.
 @item RPL/ARMovie               @tab   @tab X
@@ -983,8 +984,8 @@ following image formats are supported:
 @item Musepack SV8           @tab     @tab  X
 @item Nellymoser Asao        @tab  X  @tab  X
 @item On2 AVC (Audio for Video Codec) @tab     @tab  X
-@item Opus                   @tab  E  @tab  E
-    @tab supported through external library libopus
+@item Opus                   @tab  E  @tab  X
+    @tab encoding supported through external library libopus
 @item PCM A-law              @tab  X  @tab  X
 @item PCM mu-law             @tab  X  @tab  X
 @item PCM signed 8-bit planar  @tab  X  @tab  X