diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 04:31:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 04:32:05 +0100 |
| commit | 16ddc58bd7a2f98b47fb2597a2b349d0aba82da4 (patch) | |
| tree | 46f0b63bd1c9d5bd3970920226c12accc45845fb /doc/general.texi | |
| parent | 03e4c2d8333d46c598856f218d9dfeb9316266d8 (diff) | |
| parent | 70daeacd6ef8b354dd7d2d77ad393831a5bbf033 (diff) | |
| download | ffmpeg-16ddc58bd7a2f98b47fb2597a2b349d0aba82da4.tar.gz | |
Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
PAF demuxer and decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h
See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index cecf426f9f..e9087df349 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -205,7 +205,7 @@ library: @item American Laser Games MM @tab @tab X @tab Multimedia format used in games like Mad Dog McCree. @item 3GPP AMR @tab X @tab X -@item Amazing Studio Packed Animation File @tab @tab X +@item Amazing Studio Packed Animation File @tab @tab X @tab Multimedia format used in game Heart Of Darkness. @item Apple HTTP Live Streaming @tab @tab X @item Artworx Data Format @tab @tab X |