diff options
| author | Michael Bradshaw <mbradshaw@sorensonmedia.com> | 2012-08-12 10:29:36 -0600 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-14 16:54:25 +0200 |
| commit | a22c996a851fbfd53f075838697759a18bb2f71a (patch) | |
| tree | 784274d954a746675d1aa58f708addcd6fd1d455 /doc | |
| parent | aec9390a9d38014615d569ecaf392b22f693e4b6 (diff) | |
Add ICO muxer
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 2 | ||||
| -rw-r--r-- | doc/muxers.texi | 33 |
2 files changed, 34 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index f505173fac..9a224d823d 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -212,7 +212,7 @@ library: @tab General eXchange Format SMPTE 360M, used by Thomson Grass Valley playout servers. @item iCEDraw File @tab @tab X -@item ICO @tab @tab X +@item ICO @tab X @tab X @tab Microsoft Windows ICO @item id Quake II CIN video @tab @tab X @item id RoQ @tab X @tab X diff --git a/doc/muxers.texi b/doc/muxers.texi index aee90b53ce..2cb8e133c6 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -129,6 +129,39 @@ ffmpeg -i INPUT -f framemd5 - See also the @ref{md5} muxer. +@anchor{ico} +@section ico + +ICO file muxer. + +Microsoft's icon file format (ICO) has some strict limitations that should be noted: + +@itemize +@item +Size cannot exceed 256 pixels in any dimension + +@item +Only BMP and PNG images can be stored + +@item +If a BMP image is used, it must be one of the following pixel formats: +@example +BMP Bit Depth FFmpeg Pixel Format +1bit pal8 +4bit pal8 +8bit pal8 +16bit rgb555le +24bit bgr24 +32bit bgra +@end example + +@item +If a BMP image is used, it must use the BITMAPINFOHEADER DIB header + +@item +If a PNG image is used, it must use the rgba pixel format +@end itemize + @anchor{image2} @section image2 |