diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-29 04:40:34 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-29 04:40:34 +0400 |
| commit | 6071e4d87a9b257c3f7b5912825ede9caa757624 (patch) | |
| tree | aeaad3a1d7eb0b27f20a66665740d2a96e99f7c2 /doc/general.texi | |
| parent | 7e5cbb3c2d96c27d526aa69cbdbd1ab23739d7e5 (diff) | |
| parent | 8f5216905f88510c9a74cd91a424902aa989b9a1 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
v410dec: Check for sufficient input data. Fixes crash
fate: Add v210 codec regression tests
mpegts: adjustable minimum PES payload
mpegts: properly output large audio packets
avformat: Add SMJPEG demuxer.
Indeo 4 decoder
Conflicts:
doc/general.texi
libavcodec/v410dec.c
libavcodec/version.h
libavformat/mpegtsenc.c
libavformat/smjpeg.c
libavformat/version.h
tests/codec-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index 653b71bac1..b04d7d788f 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -318,6 +318,7 @@ library: @item Smacker @tab @tab X @tab Multimedia format used by many games. @item SMJPEG @tab @tab X + @tab Used in certain Loki game ports. @item Sony OpenMG (OMA) @tab X @tab X @tab Audio format used in Sony Sonic Stage and Sony Vegas. @item Sony PlayStation STR @tab @tab X @@ -513,6 +514,7 @@ following image formats are supported: @item Intel H.263 @tab @tab X @item Intel Indeo 2 @tab @tab X @item Intel Indeo 3 @tab @tab X +@item Intel Indeo 4 @tab @tab X @item Intel Indeo 5 @tab @tab X @item Interplay C93 @tab @tab X @tab Used in the game Cyberia from Interplay. |