[FFmpeg-cvslog] doc/general: merge dupe ProRes entries

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Jun 23 15:53:45 2020 +0200| [c949de24496793f87f089d963fe0fa86097852ba] | committer: Paul B Mahol

doc/general: merge dupe ProRes entries

While here add missing fourcc.

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

 doc/general.texi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/general.texi b/doc/general.texi
index 3c5725f4d3..8cfad1699a 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -803,6 +803,7 @@ following image formats are supported:
 @item Apple MJPEG-B          @tab     @tab  X
 @item Apple Pixlet           @tab     @tab  X
 @item Apple ProRes           @tab  X  @tab  X
+    @tab fourcc: apch,apcn,apcs,apco,ap4h,ap4x
 @item Apple QuickDraw        @tab     @tab  X
     @tab fourcc: qdrw
 @item Asus v1                @tab  X  @tab  X
@@ -987,8 +988,6 @@ following image formats are supported:
     @tab encoding supported through external library libvpx
 @item Pinnacle TARGA CineWave YUV16 @tab     @tab  X
     @tab fourcc: Y216
- at item Prores                 @tab     @tab  X
-    @tab fourcc: apch,apcn,apcs,apco
 @item Q-team QPEG            @tab     @tab  X
     @tab fourccs: QPEG, Q1.0, Q1.1
 @item QuickTime 8BPS video   @tab     @tab  X