Merge remote-tracking branch 'cus/stable'

[ffmpeg] / doc / general.texi

diff --git a/doc/general.texi b/doc/general.texi
index 9cba7bb3bb3f3e77cfa3c0dd1687be538adfa293..b4176d5daa134574f44a04bd19583ccafd2cf83b 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -287,6 +287,7 @@ library:
 @item raw Dirac                 @tab X @tab X
 @item raw DNxHD                 @tab X @tab X
 @item raw DTS                   @tab X @tab X
+@item raw DTS-HD                @tab   @tab X
 @item raw E-AC-3                @tab X @tab X
 @item raw FLAC                  @tab X @tab X
 @item raw GSM                   @tab   @tab X
@@ -440,6 +441,8 @@ following image formats are supported:
     @tab Targa (.TGA) image format
 @item XBM  @tab X @tab X
     @tab X BitMap image format
+@item XFace @tab X @tab X
+    @tab X-Face image format
 @item XWD  @tab X @tab X
     @tab X Window Dump image format
 @end multitable