[FFmpeg-cvslog] doc/general: sort subtitles formats.

Clément Bœsch git at videolan.org
Thu Dec 20 03:55:25 CET 2012


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Dec 20 03:55:16 2012 +0100| [53fa6f58632e1c08da8e961fcf3663973d59c39d] | committer: Clément Bœsch

doc/general: sort subtitles formats.

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

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

diff --git a/doc/general.texi b/doc/general.texi
index 921bdcd..9623624 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -918,7 +918,7 @@ performance on systems without hardware floating point support).
 
 @multitable @columnfractions .4 .1 .1 .1 .1
 @item Name @tab Muxing @tab Demuxing @tab Encoding @tab Decoding
- at item SSA/ASS          @tab X @tab X @tab X @tab X
+ at item 3GPP Timed Text  @tab   @tab   @tab X @tab X
 @item DVB              @tab X @tab X @tab X @tab X
 @item DVD              @tab X @tab X @tab X @tab X
 @item JACOsub          @tab X @tab X @tab   @tab X
@@ -926,11 +926,11 @@ performance on systems without hardware floating point support).
 @item PGS              @tab   @tab   @tab   @tab X
 @item RealText         @tab   @tab X @tab   @tab X
 @item SAMI             @tab   @tab X @tab   @tab X
+ at item SSA/ASS          @tab X @tab X @tab X @tab X
 @item SubRip (SRT)     @tab X @tab X @tab X @tab X
 @item SubViewer        @tab   @tab X @tab   @tab X
 @item TED Talks captions @tab @tab X @tab   @tab X
 @item VobSub (IDX+SUB) @tab   @tab X @tab   @tab X
- at item 3GPP Timed Text  @tab   @tab   @tab X @tab X
 @item WebVTT           @tab   @tab X @tab   @tab X
 @item XSUB             @tab   @tab   @tab X @tab X
 @end multitable



More information about the ffmpeg-cvslog mailing list