Merge commit '8375dc1dd101d51baa430f34c0bcadfa37873896'

[ffmpeg] / doc / general.texi

diff --git a/doc/general.texi b/doc/general.texi
index d1c26dcaf30cf8389dc19c1d603aa3d79db8b8e9..a10b7567f9f381ef5e5498c2853887370737cfb5 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -352,6 +352,7 @@ library:
     @tab A format generated by IndigoVision 8000 video server.
 @item IVF (On2)                 @tab X @tab X
     @tab A format used by libvpx
+@item Internet Video Recording  @tab   @tab X
 @item IRCAM                     @tab X @tab X
 @item LATM                      @tab X @tab X
 @item LMLM4                     @tab   @tab X
@@ -520,6 +521,8 @@ library:
 @item VC-1 test bitstream       @tab X @tab X
 @item Vidvox Hap                @tab X @tab X
 @item Vivo                      @tab   @tab X
+@item VPK                       @tab   @tab X
+    @tab Audio format used in Sony PS games.
 @item WAV                       @tab X @tab X
 @item WavPack                   @tab X @tab X
 @item WebM                      @tab X @tab X