diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:38:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 14:46:13 +0200 |
commit | 82c0055c5e71f2289936e6c2528bed5826c18c43 (patch) | |
tree | e4510e6a8cf751182378f293f7a8bc4f253c0097 /doc | |
parent | db51c65961bd692fc6ebb12c2f4183699d3db9c0 (diff) | |
parent | b5198a2637b7b45b0049a1d4b386a06f016f2520 (diff) | |
download | ffmpeg-82c0055c5e71f2289936e6c2528bed5826c18c43.tar.gz |
Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'
* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
configure: recognise Minix as OS
configure: work around bug in ash shell
eval-test: make table static const
lavr: handle clipping in the float to s32 conversion
nut: support pcm codecs not mapped in avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/nut.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/nut.texi b/doc/nut.texi index 9de9521635..d697e2ed79 100644 --- a/doc/nut.texi +++ b/doc/nut.texi @@ -54,7 +54,7 @@ to be read big-endian. @end multitable <type> is S for signed integer, U for unsigned integer, F for IEEE float -<interleaving> is D for default, as a historical artefact. +<interleaving> is D for default, P is for planar. <bits> is 8/16/24/32 @example |