Merge commit '547db1eaecd597031165a2bf637acaaacde52788'

[ffmpeg] / doc / general.texi

diff --git a/doc/general.texi b/doc/general.texi
index 9e6ae134358716afd5f6b70b1e83d343f50c17a4..efd4a92495e32e694ca5bc6576d19ba3b67f8008 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -439,6 +439,9 @@ library:
 @item QCP                       @tab   @tab X
 @item raw ADTS (AAC)            @tab X @tab X
 @item raw AC-3                  @tab X @tab X
+@item raw AMR-NB                @tab   @tab X
+@item raw AMR-WB                @tab   @tab X
+@item raw aptX                  @tab X @tab X
 @item raw Chinese AVS video     @tab X @tab X
 @item raw CRI ADX               @tab X @tab X
 @item raw Dirac                 @tab X @tab X
@@ -991,6 +994,8 @@ following image formats are supported:
 @item Amazing Studio PAF Audio @tab     @tab  X
 @item Apple lossless audio   @tab  X  @tab  X
     @tab QuickTime fourcc 'alac'
+@item aptX                   @tab  X  @tab  X
+    @tab Used in Bluetooth A2DP
 @item ATRAC1                 @tab     @tab  X
 @item ATRAC3                 @tab     @tab  X
 @item ATRAC3+                @tab     @tab  X