diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-29 02:46:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-29 02:46:11 +0200 |
| commit | 59bf303d6806e1ab0fa415f5313131c9ca7aedb7 (patch) | |
| tree | 10a2e9e17a6d4a0e499e8236da4acf49d95445aa /doc | |
| parent | 7dfd58ef495f2724cca40cd4a59b1d0c4d81aa28 (diff) | |
| parent | c4549bd66a94bec1284dcca0da19e5038a82cbe3 (diff) | |
| download | ffmpeg-59bf303d6806e1ab0fa415f5313131c9ca7aedb7.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
Chronomaster DFA decoder
DUPLICATE: framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
http: header field names are case insensitive
Conflicts:
LICENSE
README
doc/indevs.texi
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/general.texi | 4 | ||||
| -rw-r--r-- | doc/indevs.texi | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi index 23ffb0d07a..128b1079da 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -81,6 +81,8 @@ library: @tab Audio format used in some games by CRYO Interactive Entertainment. @item D-Cinema audio @tab X @tab X @item Deluxe Paint Animation @tab @tab X +@item DFA @tab @tab X + @tab This format is used in Chronomaster game @item DV video @tab X @tab X @item DXA @tab @tab X @tab This format is used in the non-Windows version of the Feeble Files @@ -371,6 +373,8 @@ following image formats are supported: @item Cirrus Logic AccuPak @tab @tab X @tab fourcc: CLJR @item Creative YUV (CYUV) @tab @tab X +@item DFA @tab @tab X + @tab Codec used in Chronomaster game. @item Dirac @tab E @tab E @tab supported through external libdirac/libschroedinger libraries @item Deluxe Paint Animation @tab @tab X diff --git a/doc/indevs.texi b/doc/indevs.texi index 5a8a8fa9b0..04871081dd 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -71,7 +71,7 @@ console. It is accessed through a file device node, usually For more detailed information read the file Documentation/fb/framebuffer.txt included in the Linux source tree. -For example, to record from the framebuffer device @file{/dev/fb0} with +To record from the framebuffer device @file{/dev/fb0} with @file{ffmpeg}: @example ffmpeg -f fbdev -r 10 -i /dev/fb0 out.avi |