diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-08 02:03:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-08 02:03:14 +0100 |
| commit | 0bd42ae72c0e88826b823d8106286d5abe2028e7 (patch) | |
| tree | da7087d1f67ea54580026e30dcedb4f58db6aba6 /doc | |
| parent | 5955c63c36e9b822f1186cd45a8dec5056b9c575 (diff) | |
| parent | 1c8c41ff079953d332f61a9d26656e4e36af606c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avformat: Avoid a warning about mixed declarations and code
BMV demuxer and decoder
matroskaenc: Make sure the seekhead struct is freed even on seek failure
mpeg12enc: Remove write-only variables.
mpeg12enc: Don't set up run-level info for level 0.
msmpeg4: Don't set up run-level info for level 0.
avformat: Warn about using network functions without calling avformat_network_init
avformat: Revise wording
rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
rdt: Check the return value of avformat_open
rtsp: Discard the dynamic handler, if it has an alloc function which failed
dsputil: use cpuflags in x86 versions of vector_clip_int32()
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi index e5f83d6d30..f026bfba17 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -71,6 +71,7 @@ library: @item Brute Force & Ignorance @tab @tab X @tab Used in the game Flash Traffic: City of Angels. @item BWF @tab X @tab X +@item Discworld II BMV @tab @tab X @item Interplay C93 @tab @tab X @tab Used in the game Cyberia from Interplay. @item Delphine Software International CIN @tab @tab X @@ -386,6 +387,7 @@ following image formats are supported: @tab AVS1-P2, JiZhun profile, encoding through external library libxavs @item Delphine Software International CIN video @tab @tab X @tab Codec used in Delphine Software International games. +@item Discworld II BMV Video @tab @tab X @item Cinepak @tab @tab X @item Cirrus Logic AccuPak @tab @tab X @tab fourcc: CLJR @@ -624,6 +626,7 @@ following image formats are supported: @tab decoding supported through external library libcelt @item Delphine Software International CIN audio @tab @tab X @tab Codec used in Delphine Software International games. +@item Discworld II BMV Audio @tab @tab X @item COOK @tab @tab X @tab All versions except 5.1 are supported. @item DCA (DTS Coherent Acoustics) @tab X @tab X |