[FFmpeg-cvslog] doc/general: update after recent additions

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Oct 25 11:51:15 2015 +0100| [1f36b43c280d36a403874e54a017472a3b2f472a] | committer: Paul B Mahol

doc/general: update after recent additions

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f36b43c280d36a403874e54a017472a3b2f472a
---

 doc/general.texi  |   14 ++++++++++++++
 libavformat/vag.c |    2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/general.texi b/doc/general.texi
index 9ea98b2..c558856 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -245,6 +245,8 @@ library:
     @tab Audio format used on the Nintendo Gamecube.
 @item AFC                       @tab   @tab X
     @tab Audio format used on the Nintendo Gamecube.
+ at item ADS/SS2                   @tab   @tab X
+    @tab Audio format used on the PS2.
 @item APNG                      @tab X @tab X
 @item ASF                       @tab X @tab X
 @item AST                       @tab X @tab X
@@ -322,6 +324,8 @@ library:
 @item G.723.1                   @tab X @tab X
 @item G.729 BIT                 @tab X @tab X
 @item G.729 raw                 @tab   @tab X
+ at item GENH                      @tab   @tab X
+    @tab Audio format for various games.
 @item GIF Animation             @tab X @tab X
 @item GXF                       @tab X @tab X
     @tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley
@@ -380,6 +384,8 @@ library:
     @tab also known as DVB Transport Stream
 @item MPEG-4                    @tab X @tab X
     @tab MPEG-4 is a variant of QuickTime.
+ at item MSF                       @tab   @tab X
+    @tab Audio format used on the PS3.
 @item Mirillis FIC video        @tab   @tab X
     @tab No cursor rendering.
 @item MIME multipart JPEG       @tab X @tab
@@ -497,6 +503,8 @@ library:
 @item SoX native format         @tab X @tab X
 @item SUN AU format             @tab X @tab X
 @item SUP raw PGS subtitles     @tab   @tab X
+ at item SVAG                      @tab   @tab X
+    @tab Audio format used in Konami PS2 games.
 @item TDSC                      @tab   @tab X
 @item Text files                @tab   @tab X
 @item THP                       @tab   @tab X
@@ -504,6 +512,8 @@ library:
 @item Tiertex Limited SEQ       @tab   @tab X
     @tab Tiertex .seq files used in the DOS CD-ROM version of the game Flashback.
 @item True Audio                @tab   @tab X
+ at item VAG                       @tab   @tab X
+    @tab Audio format used in many Sony PS2 games.
 @item VC-1 test bitstream       @tab X @tab X
 @item Vidvox Hap                @tab X @tab X
 @item Vivo                      @tab   @tab X
@@ -517,8 +527,11 @@ library:
     @tab Multimedia format used in Westwood Studios games.
 @item Westwood Studios VQA      @tab   @tab X
     @tab Multimedia format used in Westwood Studios games.
+ at item WVE                       @tab   @tab X
 @item XMV                       @tab   @tab X
     @tab Microsoft video container used in Xbox games.
+ at item XVAG                      @tab   @tab X
+    @tab Audio format used on the PS3.
 @item xWMA                      @tab   @tab X
     @tab Microsoft audio container used by XAudio 2.
 @item eXtended BINary text (XBIN) @tab @tab X
@@ -908,6 +921,7 @@ following image formats are supported:
 @item ADPCM Nintendo Gamecube AFC  @tab     @tab  X
 @item ADPCM Nintendo Gamecube DTK  @tab     @tab  X
 @item ADPCM Nintendo THP  @tab     @tab  X
+ at item APDCM Playstation      @tab     @tab  X
 @item ADPCM QT IMA           @tab  X  @tab  X
 @item ADPCM SEGA CRI ADX     @tab  X  @tab  X
     @tab Used in Sega Dreamcast games.
diff --git a/libavformat/vag.c b/libavformat/vag.c
index d3cd5ba..2875db5 100644
--- a/libavformat/vag.c
+++ b/libavformat/vag.c
@@ -75,7 +75,7 @@ static int vag_read_packet(AVFormatContext *s, AVPacket *pkt)
 
 AVInputFormat ff_vag_demuxer = {
     .name           = "vag",
-    .long_name      = NULL_IF_CONFIG_SMALL("Sony VAG"),
+    .long_name      = NULL_IF_CONFIG_SMALL("Sony PS2 VAG"),
     .read_probe     = vag_probe,
     .read_header    = vag_read_header,
     .read_packet    = vag_read_packet,