diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:37:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 10:38:08 +0200 |
| commit | 5bc892cb17225c8bfd54c12abf45012f393f03e3 (patch) | |
| tree | 9e1145ce0eaf8d5afb13e89ab6386ee9af7f330f /doc | |
| parent | c453da33a3dee16724a734d08c0c7ba71c361b67 (diff) | |
| parent | 1232a1647ab27e024a3baf4d01d40c8d08d6ced9 (diff) | |
Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'
* commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9':
Apple Intermediate Codec decoder
movenc: Don't add base_data_offset in tfhd for PIFF files
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 4f45497fa6..343fff13ab 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -488,6 +488,7 @@ following image formats are supported: @item AMV Video @tab X @tab X @tab Used in Chinese MP3 players. @item ANSI/ASCII art @tab @tab X +@item Apple Intermediate Codec @tab @tab X @item Apple MJPEG-B @tab @tab X @item Apple ProRes @tab X @tab X @item Apple QuickDraw @tab @tab X |