Fixes/updates preparing for merge.  floor1/res1 unused for now.

Monty

svn path=/branches/monty-branch-20010404/vorbis/; revision=1457