diff options
author | Paul B Mahol <onemda@gmail.com> | 2020-06-23 16:53:45 +0300 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2020-06-23 17:00:02 +0300 |
commit | c949de24496793f87f089d963fe0fa86097852ba (patch) | |
tree | e046aa24c8b603e93ff1c240e804b13a731dbda4 /doc | |
parent | eef0765236aa7f434acfded636909062bffb0503 (diff) |
doc/general: merge dupe ProRes entries
While here add missing fourcc.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/general.texi | 3 |
1 files changed, 1 insertions, 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 -@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 |