Merge pull request #4 from blackberry/next

diff --git a/README.md b/README.md
@@ -1 +1,3 @@
-Ogg Vorbis is a completely open, patent-free, professional audio encoding and streaming technology with all the benefits of Open Source.
+Ogg Vorbis is a completely open, patent-free, professional audio encoding and streaming technology with all the benefits of Open Source.
+
+See /vorbis/README for build instructions.
diff --git a/.cproject → vorbis/.cproject b/.cproject → vorbis/.cproject
diff --git a/.project → vorbis/.project b/.project → vorbis/.project
@@ -9,10 +9,6 @@
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
 			<arguments>
-				<dictionary>
-					<key>?children?</key>
-					<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
-				</dictionary>
 				<dictionary>
 					<key>?name?</key>
 					<value></value>

diff --git a/AUTHORS → vorbis/AUTHORS b/AUTHORS → vorbis/AUTHORS
diff --git a/CHANGES → vorbis/CHANGES b/CHANGES → vorbis/CHANGES
diff --git a/COPYING → vorbis/COPYING b/COPYING → vorbis/COPYING
diff --git a/Makefile.am → vorbis/Makefile.am b/Makefile.am → vorbis/Makefile.am
diff --git a/Makefile.in → vorbis/Makefile.in b/Makefile.in → vorbis/Makefile.in
diff --git a/README → vorbis/README b/README → vorbis/README
@@ -132,7 +132,7 @@ simply add the shared libraries you need to your project (OggLib and
 VorbisLib at least) and #include "ogg/ogg.h" and "vorbis/codec.h"
 wherever you need to access Ogg and Vorbis functionality.
 
-BUILDING FOR BlackBerry QNX FROM WINDOWS:
+BUILDING FOR BlackBerry QNX FOR WINDOWS (using Makefile):
 
 To build for the QNX platform on Windows, run cmd.exe and execute the following commands:
 > cd [bbndk]				where [bbndk] is where the QNX NDK was installed (i.e. C:\bbndk)
@@ -161,4 +161,23 @@ Following this, the relevant binaries should reside in the following subdirector
         [vorbis]/qnx/vorbisfile/arm/a.le.v7.g   (ARM debug)
         [vorbis]/qnx/vorbisfile/x86/a           (x86 simulator release)
         [vorbis]/qnx/vorbisfile/x86/a.g         (x86 simulator debug)
+
+BUILDING FOR BlackBerry QNX (using Momentics IDE):
+
+Alternatively, you can also import the vorbis Momentics IDE project 
+by "Import"->"Existing Projects into Workspace" and selecting the [vorbis] "Root Directory".
+This will build all the ogg and vorbis code into single library called libvorbis. 
+Depending on your selcted configuration, the output library will be built into one of the following:
+
+    libvorbis: 
+        [vorbis]/Device-Debug/libvorbis.a
+        [vorbis]/Device-Release/libvorbis.a
+        [vorbis]/Device-Coverage/libvorbis.a
+        [vorbis]/Device-Profile/libvorbis.a
+        [vorbis]/Simulator/libvorbis.a
+        [vorbis]/Simulator-Coverage/libvorbis.a
+        [vorbis]/Simulator-Profile/libvorbis.a
+
+
+
 
diff --git a/aclocal.m4 → vorbis/aclocal.m4 b/aclocal.m4 → vorbis/aclocal.m4
diff --git a/autogen.sh → vorbis/autogen.sh b/autogen.sh → vorbis/autogen.sh
diff --git a/compile → vorbis/compile b/compile → vorbis/compile
diff --git a/config.guess → vorbis/config.guess b/config.guess → vorbis/config.guess
diff --git a/config.h.in → vorbis/config.h.in b/config.h.in → vorbis/config.h.in
diff --git a/config.sub → vorbis/config.sub b/config.sub → vorbis/config.sub
diff --git a/configure → vorbis/configure b/configure → vorbis/configure
diff --git a/configure.ac → vorbis/configure.ac b/configure.ac → vorbis/configure.ac
diff --git a/depcomp → vorbis/depcomp b/depcomp → vorbis/depcomp
diff --git a/doc/01-introduction.tex → vorbis/doc/01-introduction.tex b/doc/01-introduction.tex → vorbis/doc/01-introduction.tex
diff --git a/doc/02-bitpacking.tex → vorbis/doc/02-bitpacking.tex b/doc/02-bitpacking.tex → vorbis/doc/02-bitpacking.tex
diff --git a/doc/03-codebook.tex → vorbis/doc/03-codebook.tex b/doc/03-codebook.tex → vorbis/doc/03-codebook.tex
diff --git a/doc/04-codec.tex → vorbis/doc/04-codec.tex b/doc/04-codec.tex → vorbis/doc/04-codec.tex
diff --git a/doc/05-comment.tex → vorbis/doc/05-comment.tex b/doc/05-comment.tex → vorbis/doc/05-comment.tex
diff --git a/doc/06-floor0.tex → vorbis/doc/06-floor0.tex b/doc/06-floor0.tex → vorbis/doc/06-floor0.tex
diff --git a/doc/07-floor1.tex → vorbis/doc/07-floor1.tex b/doc/07-floor1.tex → vorbis/doc/07-floor1.tex
diff --git a/doc/08-residue.tex → vorbis/doc/08-residue.tex b/doc/08-residue.tex → vorbis/doc/08-residue.tex
diff --git a/doc/09-helper.tex → vorbis/doc/09-helper.tex b/doc/09-helper.tex → vorbis/doc/09-helper.tex
diff --git a/doc/10-tables.tex → vorbis/doc/10-tables.tex b/doc/10-tables.tex → vorbis/doc/10-tables.tex
diff --git a/doc/Doxyfile.in → vorbis/doc/Doxyfile.in b/doc/Doxyfile.in → vorbis/doc/Doxyfile.in
diff --git a/doc/Makefile.am → vorbis/doc/Makefile.am b/doc/Makefile.am → vorbis/doc/Makefile.am
diff --git a/doc/Makefile.in → vorbis/doc/Makefile.in b/doc/Makefile.in → vorbis/doc/Makefile.in
diff --git a/doc/Vorbis_I_spec.cfg → vorbis/doc/Vorbis_I_spec.cfg b/doc/Vorbis_I_spec.cfg → vorbis/doc/Vorbis_I_spec.cfg
diff --git a/doc/Vorbis_I_spec.css → vorbis/doc/Vorbis_I_spec.css b/doc/Vorbis_I_spec.css → vorbis/doc/Vorbis_I_spec.css
diff --git a/doc/Vorbis_I_spec.html → vorbis/doc/Vorbis_I_spec.html b/doc/Vorbis_I_spec.html → vorbis/doc/Vorbis_I_spec.html
diff --git a/doc/Vorbis_I_spec.pdf → vorbis/doc/Vorbis_I_spec.pdf b/doc/Vorbis_I_spec.pdf → vorbis/doc/Vorbis_I_spec.pdf
diff --git a/doc/Vorbis_I_spec.tex → vorbis/doc/Vorbis_I_spec.tex b/doc/Vorbis_I_spec.tex → vorbis/doc/Vorbis_I_spec.tex
diff --git a/doc/a1-encapsulation-ogg.tex → vorbis/doc/a1-encapsulation-ogg.tex b/doc/a1-encapsulation-ogg.tex → vorbis/doc/a1-encapsulation-ogg.tex
diff --git a/doc/a2-encapsulation-rtp.tex → vorbis/doc/a2-encapsulation-rtp.tex b/doc/a2-encapsulation-rtp.tex → vorbis/doc/a2-encapsulation-rtp.tex
diff --git a/doc/components.png → vorbis/doc/components.png b/doc/components.png → vorbis/doc/components.png
diff --git a/doc/eightphase.png → vorbis/doc/eightphase.png b/doc/eightphase.png → vorbis/doc/eightphase.png
diff --git a/doc/evenlsp.png → vorbis/doc/evenlsp.png b/doc/evenlsp.png → vorbis/doc/evenlsp.png
diff --git a/doc/fish_xiph_org.png → vorbis/doc/fish_xiph_org.png b/doc/fish_xiph_org.png → vorbis/doc/fish_xiph_org.png
diff --git a/doc/floor1-1.png → vorbis/doc/floor1-1.png b/doc/floor1-1.png → vorbis/doc/floor1-1.png
diff --git a/doc/floor1-2.png → vorbis/doc/floor1-2.png b/doc/floor1-2.png → vorbis/doc/floor1-2.png
diff --git a/doc/floor1-3.png → vorbis/doc/floor1-3.png b/doc/floor1-3.png → vorbis/doc/floor1-3.png
diff --git a/doc/floor1-4.png → vorbis/doc/floor1-4.png b/doc/floor1-4.png → vorbis/doc/floor1-4.png
diff --git a/doc/floor1_inverse_dB_table.html → vorbis/doc/floor1_inverse_dB_table.html b/doc/floor1_inverse_dB_table.html → vorbis/doc/floor1_inverse_dB_table.html
diff --git a/doc/floorval.png → vorbis/doc/floorval.png b/doc/floorval.png → vorbis/doc/floorval.png
diff --git a/doc/footer.tex → vorbis/doc/footer.tex b/doc/footer.tex → vorbis/doc/footer.tex
diff --git a/doc/fourphase.png → vorbis/doc/fourphase.png b/doc/fourphase.png → vorbis/doc/fourphase.png
diff --git a/doc/framing.html → vorbis/doc/framing.html b/doc/framing.html → vorbis/doc/framing.html
diff --git a/doc/helper.html → vorbis/doc/helper.html b/doc/helper.html → vorbis/doc/helper.html
diff --git a/doc/hufftree-under.png → vorbis/doc/hufftree-under.png b/doc/hufftree-under.png → vorbis/doc/hufftree-under.png
diff --git a/doc/hufftree.png → vorbis/doc/hufftree.png b/doc/hufftree.png → vorbis/doc/hufftree.png
diff --git a/doc/index.html → vorbis/doc/index.html b/doc/index.html → vorbis/doc/index.html
diff --git a/doc/libvorbis/Makefile.am → vorbis/doc/libvorbis/Makefile.am b/doc/libvorbis/Makefile.am → vorbis/doc/libvorbis/Makefile.am
diff --git a/doc/libvorbis/Makefile.in → vorbis/doc/libvorbis/Makefile.in b/doc/libvorbis/Makefile.in → vorbis/doc/libvorbis/Makefile.in
diff --git a/doc/libvorbis/index.html → vorbis/doc/libvorbis/index.html b/doc/libvorbis/index.html → vorbis/doc/libvorbis/index.html
diff --git a/doc/libvorbis/overview.html → vorbis/doc/libvorbis/overview.html b/doc/libvorbis/overview.html → vorbis/doc/libvorbis/overview.html
diff --git a/doc/libvorbis/reference.html → vorbis/doc/libvorbis/reference.html b/doc/libvorbis/reference.html → vorbis/doc/libvorbis/reference.html
diff --git a/doc/libvorbis/return.html → vorbis/doc/libvorbis/return.html b/doc/libvorbis/return.html → vorbis/doc/libvorbis/return.html
diff --git a/doc/libvorbis/style.css → vorbis/doc/libvorbis/style.css b/doc/libvorbis/style.css → vorbis/doc/libvorbis/style.css
diff --git a/doc/libvorbis/vorbis_analysis.html → vorbis/doc/libvorbis/vorbis_analysis.html b/doc/libvorbis/vorbis_analysis.html → vorbis/doc/libvorbis/vorbis_analysis.html
diff --git a/doc/libvorbis/vorbis_analysis_blockout.html → ...c/libvorbis/vorbis_analysis_blockout.html b/doc/libvorbis/vorbis_analysis_blockout.html → ...c/libvorbis/vorbis_analysis_blockout.html
diff --git a/doc/libvorbis/vorbis_analysis_buffer.html → ...doc/libvorbis/vorbis_analysis_buffer.html b/doc/libvorbis/vorbis_analysis_buffer.html → ...doc/libvorbis/vorbis_analysis_buffer.html
diff --git a/doc/libvorbis/vorbis_analysis_headerout.html → .../libvorbis/vorbis_analysis_headerout.html b/doc/libvorbis/vorbis_analysis_headerout.html → .../libvorbis/vorbis_analysis_headerout.html
diff --git a/doc/libvorbis/vorbis_analysis_init.html → ...s/doc/libvorbis/vorbis_analysis_init.html b/doc/libvorbis/vorbis_analysis_init.html → ...s/doc/libvorbis/vorbis_analysis_init.html
diff --git a/doc/libvorbis/vorbis_analysis_wrote.html → .../doc/libvorbis/vorbis_analysis_wrote.html b/doc/libvorbis/vorbis_analysis_wrote.html → .../doc/libvorbis/vorbis_analysis_wrote.html
diff --git a/doc/libvorbis/vorbis_bitrate_addblock.html → ...oc/libvorbis/vorbis_bitrate_addblock.html b/doc/libvorbis/vorbis_bitrate_addblock.html → ...oc/libvorbis/vorbis_bitrate_addblock.html
diff --git a/...libvorbis/vorbis_bitrate_flushpacket.html → ...libvorbis/vorbis_bitrate_flushpacket.html b/...libvorbis/vorbis_bitrate_flushpacket.html → ...libvorbis/vorbis_bitrate_flushpacket.html
diff --git a/doc/libvorbis/vorbis_block.html → vorbis/doc/libvorbis/vorbis_block.html b/doc/libvorbis/vorbis_block.html → vorbis/doc/libvorbis/vorbis_block.html
diff --git a/doc/libvorbis/vorbis_block_clear.html → vorbis/doc/libvorbis/vorbis_block_clear.html b/doc/libvorbis/vorbis_block_clear.html → vorbis/doc/libvorbis/vorbis_block_clear.html
diff --git a/doc/libvorbis/vorbis_block_init.html → vorbis/doc/libvorbis/vorbis_block_init.html b/doc/libvorbis/vorbis_block_init.html → vorbis/doc/libvorbis/vorbis_block_init.html
diff --git a/doc/libvorbis/vorbis_comment.html → vorbis/doc/libvorbis/vorbis_comment.html b/doc/libvorbis/vorbis_comment.html → vorbis/doc/libvorbis/vorbis_comment.html
diff --git a/doc/libvorbis/vorbis_comment_add.html → vorbis/doc/libvorbis/vorbis_comment_add.html b/doc/libvorbis/vorbis_comment_add.html → vorbis/doc/libvorbis/vorbis_comment_add.html
diff --git a/doc/libvorbis/vorbis_comment_add_tag.html → ...doc/libvorbis/vorbis_comment_add_tag.html b/doc/libvorbis/vorbis_comment_add_tag.html → ...doc/libvorbis/vorbis_comment_add_tag.html
diff --git a/doc/libvorbis/vorbis_comment_clear.html → ...s/doc/libvorbis/vorbis_comment_clear.html b/doc/libvorbis/vorbis_comment_clear.html → ...s/doc/libvorbis/vorbis_comment_clear.html
diff --git a/doc/libvorbis/vorbis_comment_init.html → ...is/doc/libvorbis/vorbis_comment_init.html b/doc/libvorbis/vorbis_comment_init.html → ...is/doc/libvorbis/vorbis_comment_init.html
diff --git a/doc/libvorbis/vorbis_comment_query.html → ...s/doc/libvorbis/vorbis_comment_query.html b/doc/libvorbis/vorbis_comment_query.html → ...s/doc/libvorbis/vorbis_comment_query.html
diff --git a/...libvorbis/vorbis_comment_query_count.html → ...libvorbis/vorbis_comment_query_count.html b/...libvorbis/vorbis_comment_query_count.html → ...libvorbis/vorbis_comment_query_count.html
diff --git a/doc/libvorbis/vorbis_commentheader_out.html → ...c/libvorbis/vorbis_commentheader_out.html b/doc/libvorbis/vorbis_commentheader_out.html → ...c/libvorbis/vorbis_commentheader_out.html
diff --git a/doc/libvorbis/vorbis_dsp_clear.html → vorbis/doc/libvorbis/vorbis_dsp_clear.html b/doc/libvorbis/vorbis_dsp_clear.html → vorbis/doc/libvorbis/vorbis_dsp_clear.html
diff --git a/doc/libvorbis/vorbis_dsp_state.html → vorbis/doc/libvorbis/vorbis_dsp_state.html b/doc/libvorbis/vorbis_dsp_state.html → vorbis/doc/libvorbis/vorbis_dsp_state.html
diff --git a/doc/libvorbis/vorbis_granule_time.html → ...is/doc/libvorbis/vorbis_granule_time.html b/doc/libvorbis/vorbis_granule_time.html → ...is/doc/libvorbis/vorbis_granule_time.html
diff --git a/doc/libvorbis/vorbis_info.html → vorbis/doc/libvorbis/vorbis_info.html b/doc/libvorbis/vorbis_info.html → vorbis/doc/libvorbis/vorbis_info.html
diff --git a/doc/libvorbis/vorbis_info_blocksize.html → .../doc/libvorbis/vorbis_info_blocksize.html b/doc/libvorbis/vorbis_info_blocksize.html → .../doc/libvorbis/vorbis_info_blocksize.html
diff --git a/doc/libvorbis/vorbis_info_clear.html → vorbis/doc/libvorbis/vorbis_info_clear.html b/doc/libvorbis/vorbis_info_clear.html → vorbis/doc/libvorbis/vorbis_info_clear.html
diff --git a/doc/libvorbis/vorbis_info_init.html → vorbis/doc/libvorbis/vorbis_info_init.html b/doc/libvorbis/vorbis_info_init.html → vorbis/doc/libvorbis/vorbis_info_init.html
diff --git a/doc/libvorbis/vorbis_packet_blocksize.html → ...oc/libvorbis/vorbis_packet_blocksize.html b/doc/libvorbis/vorbis_packet_blocksize.html → ...oc/libvorbis/vorbis_packet_blocksize.html
diff --git a/doc/libvorbis/vorbis_synthesis.html → vorbis/doc/libvorbis/vorbis_synthesis.html b/doc/libvorbis/vorbis_synthesis.html → vorbis/doc/libvorbis/vorbis_synthesis.html
diff --git a/doc/libvorbis/vorbis_synthesis_blockin.html → ...c/libvorbis/vorbis_synthesis_blockin.html b/doc/libvorbis/vorbis_synthesis_blockin.html → ...c/libvorbis/vorbis_synthesis_blockin.html
diff --git a/doc/libvorbis/vorbis_synthesis_halfrate.html → .../libvorbis/vorbis_synthesis_halfrate.html b/doc/libvorbis/vorbis_synthesis_halfrate.html → .../libvorbis/vorbis_synthesis_halfrate.html
diff --git a/...ibvorbis/vorbis_synthesis_halfrate_p.html → ...ibvorbis/vorbis_synthesis_halfrate_p.html b/...ibvorbis/vorbis_synthesis_halfrate_p.html → ...ibvorbis/vorbis_synthesis_halfrate_p.html
diff --git a/doc/libvorbis/vorbis_synthesis_headerin.html → .../libvorbis/vorbis_synthesis_headerin.html b/doc/libvorbis/vorbis_synthesis_headerin.html → .../libvorbis/vorbis_synthesis_headerin.html
diff --git a/doc/libvorbis/vorbis_synthesis_idheader.html → .../libvorbis/vorbis_synthesis_idheader.html b/doc/libvorbis/vorbis_synthesis_idheader.html → .../libvorbis/vorbis_synthesis_idheader.html
diff --git a/doc/libvorbis/vorbis_synthesis_init.html → .../doc/libvorbis/vorbis_synthesis_init.html b/doc/libvorbis/vorbis_synthesis_init.html → .../doc/libvorbis/vorbis_synthesis_init.html
diff --git a/doc/libvorbis/vorbis_synthesis_lapout.html → ...oc/libvorbis/vorbis_synthesis_lapout.html b/doc/libvorbis/vorbis_synthesis_lapout.html → ...oc/libvorbis/vorbis_synthesis_lapout.html
diff --git a/doc/libvorbis/vorbis_synthesis_pcmout.html → ...oc/libvorbis/vorbis_synthesis_pcmout.html b/doc/libvorbis/vorbis_synthesis_pcmout.html → ...oc/libvorbis/vorbis_synthesis_pcmout.html
diff --git a/doc/libvorbis/vorbis_synthesis_read.html → .../doc/libvorbis/vorbis_synthesis_read.html b/doc/libvorbis/vorbis_synthesis_read.html → .../doc/libvorbis/vorbis_synthesis_read.html
diff --git a/doc/libvorbis/vorbis_synthesis_restart.html → ...c/libvorbis/vorbis_synthesis_restart.html b/doc/libvorbis/vorbis_synthesis_restart.html → ...c/libvorbis/vorbis_synthesis_restart.html
diff --git a/...libvorbis/vorbis_synthesis_trackonly.html → ...libvorbis/vorbis_synthesis_trackonly.html b/...libvorbis/vorbis_synthesis_trackonly.html → ...libvorbis/vorbis_synthesis_trackonly.html
diff --git a/doc/libvorbis/vorbis_version_string.html → .../doc/libvorbis/vorbis_version_string.html b/doc/libvorbis/vorbis_version_string.html → .../doc/libvorbis/vorbis_version_string.html
diff --git a/doc/lspmap.png → vorbis/doc/lspmap.png b/doc/lspmap.png → vorbis/doc/lspmap.png
diff --git a/doc/oddlsp.png → vorbis/doc/oddlsp.png b/doc/oddlsp.png → vorbis/doc/oddlsp.png
diff --git a/doc/oggstream.html → vorbis/doc/oggstream.html b/doc/oggstream.html → vorbis/doc/oggstream.html
diff --git a/doc/programming.html → vorbis/doc/programming.html b/doc/programming.html → vorbis/doc/programming.html
diff --git a/doc/residue-pack.png → vorbis/doc/residue-pack.png b/doc/residue-pack.png → vorbis/doc/residue-pack.png
diff --git a/doc/residue2.png → vorbis/doc/residue2.png b/doc/residue2.png → vorbis/doc/residue2.png
diff --git a/doc/rfc5215.txt → vorbis/doc/rfc5215.txt b/doc/rfc5215.txt → vorbis/doc/rfc5215.txt
diff --git a/doc/rfc5215.xml → vorbis/doc/rfc5215.xml b/doc/rfc5215.xml → vorbis/doc/rfc5215.xml
diff --git a/doc/squarepolar.png → vorbis/doc/squarepolar.png b/doc/squarepolar.png → vorbis/doc/squarepolar.png
diff --git a/doc/stereo.html → vorbis/doc/stereo.html b/doc/stereo.html → vorbis/doc/stereo.html
diff --git a/doc/stream.png → vorbis/doc/stream.png b/doc/stream.png → vorbis/doc/stream.png
diff --git a/doc/v-comment.html → vorbis/doc/v-comment.html b/doc/v-comment.html → vorbis/doc/v-comment.html
diff --git a/doc/vorbis-clip.txt → vorbis/doc/vorbis-clip.txt b/doc/vorbis-clip.txt → vorbis/doc/vorbis-clip.txt
diff --git a/doc/vorbis-errors.txt → vorbis/doc/vorbis-errors.txt b/doc/vorbis-errors.txt → vorbis/doc/vorbis-errors.txt
diff --git a/doc/vorbis-fidelity.html → vorbis/doc/vorbis-fidelity.html b/doc/vorbis-fidelity.html → vorbis/doc/vorbis-fidelity.html
diff --git a/doc/vorbis.html → vorbis/doc/vorbis.html b/doc/vorbis.html → vorbis/doc/vorbis.html
diff --git a/doc/vorbisenc/Makefile.am → vorbis/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am → vorbis/doc/vorbisenc/Makefile.am
diff --git a/doc/vorbisenc/Makefile.in → vorbis/doc/vorbisenc/Makefile.in b/doc/vorbisenc/Makefile.in → vorbis/doc/vorbisenc/Makefile.in
diff --git a/doc/vorbisenc/changes.html → vorbis/doc/vorbisenc/changes.html b/doc/vorbisenc/changes.html → vorbis/doc/vorbisenc/changes.html
diff --git a/doc/vorbisenc/examples.html → vorbis/doc/vorbisenc/examples.html b/doc/vorbisenc/examples.html → vorbis/doc/vorbisenc/examples.html
diff --git a/doc/vorbisenc/index.html → vorbis/doc/vorbisenc/index.html b/doc/vorbisenc/index.html → vorbis/doc/vorbisenc/index.html
diff --git a/doc/vorbisenc/ovectl_ratemanage2_arg.html → ...doc/vorbisenc/ovectl_ratemanage2_arg.html b/doc/vorbisenc/ovectl_ratemanage2_arg.html → ...doc/vorbisenc/ovectl_ratemanage2_arg.html
diff --git a/doc/vorbisenc/ovectl_ratemanage_arg.html → .../doc/vorbisenc/ovectl_ratemanage_arg.html b/doc/vorbisenc/ovectl_ratemanage_arg.html → .../doc/vorbisenc/ovectl_ratemanage_arg.html
diff --git a/doc/vorbisenc/overview.html → vorbis/doc/vorbisenc/overview.html b/doc/vorbisenc/overview.html → vorbis/doc/vorbisenc/overview.html
diff --git a/doc/vorbisenc/reference.html → vorbis/doc/vorbisenc/reference.html b/doc/vorbisenc/reference.html → vorbis/doc/vorbisenc/reference.html
diff --git a/doc/vorbisenc/style.css → vorbis/doc/vorbisenc/style.css b/doc/vorbisenc/style.css → vorbis/doc/vorbisenc/style.css
diff --git a/doc/vorbisenc/vorbis_encode_ctl.html → vorbis/doc/vorbisenc/vorbis_encode_ctl.html b/doc/vorbisenc/vorbis_encode_ctl.html → vorbis/doc/vorbisenc/vorbis_encode_ctl.html
diff --git a/doc/vorbisenc/vorbis_encode_init.html → vorbis/doc/vorbisenc/vorbis_encode_init.html b/doc/vorbisenc/vorbis_encode_init.html → vorbis/doc/vorbisenc/vorbis_encode_init.html
diff --git a/doc/vorbisenc/vorbis_encode_init_vbr.html → ...doc/vorbisenc/vorbis_encode_init_vbr.html b/doc/vorbisenc/vorbis_encode_init_vbr.html → ...doc/vorbisenc/vorbis_encode_init_vbr.html
diff --git a/doc/vorbisenc/vorbis_encode_setup_init.html → ...c/vorbisenc/vorbis_encode_setup_init.html b/doc/vorbisenc/vorbis_encode_setup_init.html → ...c/vorbisenc/vorbis_encode_setup_init.html
diff --git a/...orbisenc/vorbis_encode_setup_managed.html → ...orbisenc/vorbis_encode_setup_managed.html b/...orbisenc/vorbis_encode_setup_managed.html → ...orbisenc/vorbis_encode_setup_managed.html
diff --git a/doc/vorbisenc/vorbis_encode_setup_vbr.html → ...oc/vorbisenc/vorbis_encode_setup_vbr.html b/doc/vorbisenc/vorbis_encode_setup_vbr.html → ...oc/vorbisenc/vorbis_encode_setup_vbr.html
diff --git a/doc/vorbisfile/Makefile.am → vorbis/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am → vorbis/doc/vorbisfile/Makefile.am
diff --git a/doc/vorbisfile/Makefile.in → vorbis/doc/vorbisfile/Makefile.in b/doc/vorbisfile/Makefile.in → vorbis/doc/vorbisfile/Makefile.in
diff --git a/doc/vorbisfile/OggVorbis_File.html → vorbis/doc/vorbisfile/OggVorbis_File.html b/doc/vorbisfile/OggVorbis_File.html → vorbis/doc/vorbisfile/OggVorbis_File.html
diff --git a/doc/vorbisfile/callbacks.html → vorbis/doc/vorbisfile/callbacks.html b/doc/vorbisfile/callbacks.html → vorbis/doc/vorbisfile/callbacks.html
diff --git a/doc/vorbisfile/chaining_example_c.html → ...is/doc/vorbisfile/chaining_example_c.html b/doc/vorbisfile/chaining_example_c.html → ...is/doc/vorbisfile/chaining_example_c.html
diff --git a/doc/vorbisfile/chainingexample.html → vorbis/doc/vorbisfile/chainingexample.html b/doc/vorbisfile/chainingexample.html → vorbis/doc/vorbisfile/chainingexample.html
diff --git a/doc/vorbisfile/crosslap.html → vorbis/doc/vorbisfile/crosslap.html b/doc/vorbisfile/crosslap.html → vorbis/doc/vorbisfile/crosslap.html
diff --git a/doc/vorbisfile/datastructures.html → vorbis/doc/vorbisfile/datastructures.html b/doc/vorbisfile/datastructures.html → vorbis/doc/vorbisfile/datastructures.html
diff --git a/doc/vorbisfile/decoding.html → vorbis/doc/vorbisfile/decoding.html b/doc/vorbisfile/decoding.html → vorbis/doc/vorbisfile/decoding.html
diff --git a/doc/vorbisfile/example.html → vorbis/doc/vorbisfile/example.html b/doc/vorbisfile/example.html → vorbis/doc/vorbisfile/example.html
diff --git a/doc/vorbisfile/exampleindex.html → vorbis/doc/vorbisfile/exampleindex.html b/doc/vorbisfile/exampleindex.html → vorbis/doc/vorbisfile/exampleindex.html
diff --git a/doc/vorbisfile/fileinfo.html → vorbis/doc/vorbisfile/fileinfo.html b/doc/vorbisfile/fileinfo.html → vorbis/doc/vorbisfile/fileinfo.html
diff --git a/doc/vorbisfile/index.html → vorbis/doc/vorbisfile/index.html b/doc/vorbisfile/index.html → vorbis/doc/vorbisfile/index.html
diff --git a/doc/vorbisfile/initialization.html → vorbis/doc/vorbisfile/initialization.html b/doc/vorbisfile/initialization.html → vorbis/doc/vorbisfile/initialization.html
diff --git a/doc/vorbisfile/ov_bitrate.html → vorbis/doc/vorbisfile/ov_bitrate.html b/doc/vorbisfile/ov_bitrate.html → vorbis/doc/vorbisfile/ov_bitrate.html
diff --git a/doc/vorbisfile/ov_bitrate_instant.html → ...is/doc/vorbisfile/ov_bitrate_instant.html b/doc/vorbisfile/ov_bitrate_instant.html → ...is/doc/vorbisfile/ov_bitrate_instant.html
diff --git a/doc/vorbisfile/ov_callbacks.html → vorbis/doc/vorbisfile/ov_callbacks.html b/doc/vorbisfile/ov_callbacks.html → vorbis/doc/vorbisfile/ov_callbacks.html
diff --git a/doc/vorbisfile/ov_clear.html → vorbis/doc/vorbisfile/ov_clear.html b/doc/vorbisfile/ov_clear.html → vorbis/doc/vorbisfile/ov_clear.html
diff --git a/doc/vorbisfile/ov_comment.html → vorbis/doc/vorbisfile/ov_comment.html b/doc/vorbisfile/ov_comment.html → vorbis/doc/vorbisfile/ov_comment.html
diff --git a/doc/vorbisfile/ov_crosslap.html → vorbis/doc/vorbisfile/ov_crosslap.html b/doc/vorbisfile/ov_crosslap.html → vorbis/doc/vorbisfile/ov_crosslap.html
diff --git a/doc/vorbisfile/ov_fopen.html → vorbis/doc/vorbisfile/ov_fopen.html b/doc/vorbisfile/ov_fopen.html → vorbis/doc/vorbisfile/ov_fopen.html
diff --git a/doc/vorbisfile/ov_info.html → vorbis/doc/vorbisfile/ov_info.html b/doc/vorbisfile/ov_info.html → vorbis/doc/vorbisfile/ov_info.html
diff --git a/doc/vorbisfile/ov_open.html → vorbis/doc/vorbisfile/ov_open.html b/doc/vorbisfile/ov_open.html → vorbis/doc/vorbisfile/ov_open.html
diff --git a/doc/vorbisfile/ov_open_callbacks.html → vorbis/doc/vorbisfile/ov_open_callbacks.html b/doc/vorbisfile/ov_open_callbacks.html → vorbis/doc/vorbisfile/ov_open_callbacks.html
diff --git a/doc/vorbisfile/ov_pcm_seek.html → vorbis/doc/vorbisfile/ov_pcm_seek.html b/doc/vorbisfile/ov_pcm_seek.html → vorbis/doc/vorbisfile/ov_pcm_seek.html
diff --git a/doc/vorbisfile/ov_pcm_seek_lap.html → vorbis/doc/vorbisfile/ov_pcm_seek_lap.html b/doc/vorbisfile/ov_pcm_seek_lap.html → vorbis/doc/vorbisfile/ov_pcm_seek_lap.html
diff --git a/doc/vorbisfile/ov_pcm_seek_page.html → vorbis/doc/vorbisfile/ov_pcm_seek_page.html b/doc/vorbisfile/ov_pcm_seek_page.html → vorbis/doc/vorbisfile/ov_pcm_seek_page.html
diff --git a/doc/vorbisfile/ov_pcm_seek_page_lap.html → .../doc/vorbisfile/ov_pcm_seek_page_lap.html b/doc/vorbisfile/ov_pcm_seek_page_lap.html → .../doc/vorbisfile/ov_pcm_seek_page_lap.html
diff --git a/doc/vorbisfile/ov_pcm_tell.html → vorbis/doc/vorbisfile/ov_pcm_tell.html b/doc/vorbisfile/ov_pcm_tell.html → vorbis/doc/vorbisfile/ov_pcm_tell.html
diff --git a/doc/vorbisfile/ov_pcm_total.html → vorbis/doc/vorbisfile/ov_pcm_total.html b/doc/vorbisfile/ov_pcm_total.html → vorbis/doc/vorbisfile/ov_pcm_total.html
diff --git a/doc/vorbisfile/ov_raw_seek.html → vorbis/doc/vorbisfile/ov_raw_seek.html b/doc/vorbisfile/ov_raw_seek.html → vorbis/doc/vorbisfile/ov_raw_seek.html
diff --git a/doc/vorbisfile/ov_raw_seek_lap.html → vorbis/doc/vorbisfile/ov_raw_seek_lap.html b/doc/vorbisfile/ov_raw_seek_lap.html → vorbis/doc/vorbisfile/ov_raw_seek_lap.html
diff --git a/doc/vorbisfile/ov_raw_tell.html → vorbis/doc/vorbisfile/ov_raw_tell.html b/doc/vorbisfile/ov_raw_tell.html → vorbis/doc/vorbisfile/ov_raw_tell.html
diff --git a/doc/vorbisfile/ov_raw_total.html → vorbis/doc/vorbisfile/ov_raw_total.html b/doc/vorbisfile/ov_raw_total.html → vorbis/doc/vorbisfile/ov_raw_total.html
diff --git a/doc/vorbisfile/ov_read.html → vorbis/doc/vorbisfile/ov_read.html b/doc/vorbisfile/ov_read.html → vorbis/doc/vorbisfile/ov_read.html
diff --git a/doc/vorbisfile/ov_read_filter.html → vorbis/doc/vorbisfile/ov_read_filter.html b/doc/vorbisfile/ov_read_filter.html → vorbis/doc/vorbisfile/ov_read_filter.html
diff --git a/doc/vorbisfile/ov_read_float.html → vorbis/doc/vorbisfile/ov_read_float.html b/doc/vorbisfile/ov_read_float.html → vorbis/doc/vorbisfile/ov_read_float.html
diff --git a/doc/vorbisfile/ov_seekable.html → vorbis/doc/vorbisfile/ov_seekable.html b/doc/vorbisfile/ov_seekable.html → vorbis/doc/vorbisfile/ov_seekable.html
diff --git a/doc/vorbisfile/ov_serialnumber.html → vorbis/doc/vorbisfile/ov_serialnumber.html b/doc/vorbisfile/ov_serialnumber.html → vorbis/doc/vorbisfile/ov_serialnumber.html
diff --git a/doc/vorbisfile/ov_streams.html → vorbis/doc/vorbisfile/ov_streams.html b/doc/vorbisfile/ov_streams.html → vorbis/doc/vorbisfile/ov_streams.html
diff --git a/doc/vorbisfile/ov_test.html → vorbis/doc/vorbisfile/ov_test.html b/doc/vorbisfile/ov_test.html → vorbis/doc/vorbisfile/ov_test.html
diff --git a/doc/vorbisfile/ov_test_callbacks.html → vorbis/doc/vorbisfile/ov_test_callbacks.html b/doc/vorbisfile/ov_test_callbacks.html → vorbis/doc/vorbisfile/ov_test_callbacks.html
diff --git a/doc/vorbisfile/ov_test_open.html → vorbis/doc/vorbisfile/ov_test_open.html b/doc/vorbisfile/ov_test_open.html → vorbis/doc/vorbisfile/ov_test_open.html
diff --git a/doc/vorbisfile/ov_time_seek.html → vorbis/doc/vorbisfile/ov_time_seek.html b/doc/vorbisfile/ov_time_seek.html → vorbis/doc/vorbisfile/ov_time_seek.html
diff --git a/doc/vorbisfile/ov_time_seek_lap.html → vorbis/doc/vorbisfile/ov_time_seek_lap.html b/doc/vorbisfile/ov_time_seek_lap.html → vorbis/doc/vorbisfile/ov_time_seek_lap.html
diff --git a/doc/vorbisfile/ov_time_seek_page.html → vorbis/doc/vorbisfile/ov_time_seek_page.html b/doc/vorbisfile/ov_time_seek_page.html → vorbis/doc/vorbisfile/ov_time_seek_page.html
diff --git a/doc/vorbisfile/ov_time_seek_page_lap.html → ...doc/vorbisfile/ov_time_seek_page_lap.html b/doc/vorbisfile/ov_time_seek_page_lap.html → ...doc/vorbisfile/ov_time_seek_page_lap.html
diff --git a/doc/vorbisfile/ov_time_tell.html → vorbis/doc/vorbisfile/ov_time_tell.html b/doc/vorbisfile/ov_time_tell.html → vorbis/doc/vorbisfile/ov_time_tell.html
diff --git a/doc/vorbisfile/ov_time_total.html → vorbis/doc/vorbisfile/ov_time_total.html b/doc/vorbisfile/ov_time_total.html → vorbis/doc/vorbisfile/ov_time_total.html
diff --git a/doc/vorbisfile/overview.html → vorbis/doc/vorbisfile/overview.html b/doc/vorbisfile/overview.html → vorbis/doc/vorbisfile/overview.html
diff --git a/doc/vorbisfile/reference.html → vorbis/doc/vorbisfile/reference.html b/doc/vorbisfile/reference.html → vorbis/doc/vorbisfile/reference.html
diff --git a/doc/vorbisfile/seekexample.html → vorbis/doc/vorbisfile/seekexample.html b/doc/vorbisfile/seekexample.html → vorbis/doc/vorbisfile/seekexample.html
diff --git a/doc/vorbisfile/seeking.html → vorbis/doc/vorbisfile/seeking.html b/doc/vorbisfile/seeking.html → vorbis/doc/vorbisfile/seeking.html
diff --git a/doc/vorbisfile/seeking_example_c.html → vorbis/doc/vorbisfile/seeking_example_c.html b/doc/vorbisfile/seeking_example_c.html → vorbis/doc/vorbisfile/seeking_example_c.html
diff --git a/doc/vorbisfile/seeking_test_c.html → vorbis/doc/vorbisfile/seeking_test_c.html b/doc/vorbisfile/seeking_test_c.html → vorbis/doc/vorbisfile/seeking_test_c.html
diff --git a/doc/vorbisfile/seekingexample.html → vorbis/doc/vorbisfile/seekingexample.html b/doc/vorbisfile/seekingexample.html → vorbis/doc/vorbisfile/seekingexample.html
diff --git a/doc/vorbisfile/style.css → vorbis/doc/vorbisfile/style.css b/doc/vorbisfile/style.css → vorbis/doc/vorbisfile/style.css
diff --git a/doc/vorbisfile/threads.html → vorbis/doc/vorbisfile/threads.html b/doc/vorbisfile/threads.html → vorbis/doc/vorbisfile/threads.html
diff --git a/doc/vorbisfile/vorbisfile_example_c.html → .../doc/vorbisfile/vorbisfile_example_c.html b/doc/vorbisfile/vorbisfile_example_c.html → .../doc/vorbisfile/vorbisfile_example_c.html
diff --git a/doc/vorbisword2.png → vorbis/doc/vorbisword2.png b/doc/vorbisword2.png → vorbis/doc/vorbisword2.png
diff --git a/doc/wait.png → vorbis/doc/wait.png b/doc/wait.png → vorbis/doc/wait.png
diff --git a/doc/white-xifish.png → vorbis/doc/white-xifish.png b/doc/white-xifish.png → vorbis/doc/white-xifish.png
diff --git a/doc/window1.png → vorbis/doc/window1.png b/doc/window1.png → vorbis/doc/window1.png
diff --git a/doc/window2.png → vorbis/doc/window2.png b/doc/window2.png → vorbis/doc/window2.png
diff --git a/doc/xifish.pdf → vorbis/doc/xifish.pdf b/doc/xifish.pdf → vorbis/doc/xifish.pdf
diff --git a/examples/Makefile.am → vorbis/examples/Makefile.am b/examples/Makefile.am → vorbis/examples/Makefile.am
diff --git a/examples/Makefile.in → vorbis/examples/Makefile.in b/examples/Makefile.in → vorbis/examples/Makefile.in
diff --git a/examples/chaining_example.c → vorbis/examples/chaining_example.c b/examples/chaining_example.c → vorbis/examples/chaining_example.c
diff --git a/examples/decoder_example.c → vorbis/examples/decoder_example.c b/examples/decoder_example.c → vorbis/examples/decoder_example.c
diff --git a/examples/encoder_example.c → vorbis/examples/encoder_example.c b/examples/encoder_example.c → vorbis/examples/encoder_example.c
diff --git a/examples/frameview.pl → vorbis/examples/frameview.pl b/examples/frameview.pl → vorbis/examples/frameview.pl
diff --git a/examples/seeking_example.c → vorbis/examples/seeking_example.c b/examples/seeking_example.c → vorbis/examples/seeking_example.c
diff --git a/examples/vorbisfile_example.c → vorbis/examples/vorbisfile_example.c b/examples/vorbisfile_example.c → vorbis/examples/vorbisfile_example.c
diff --git a/include/Makefile.am → vorbis/include/Makefile.am b/include/Makefile.am → vorbis/include/Makefile.am
diff --git a/include/Makefile.in → vorbis/include/Makefile.in b/include/Makefile.in → vorbis/include/Makefile.in
diff --git a/include/vorbis/Makefile.am → vorbis/include/vorbis/Makefile.am b/include/vorbis/Makefile.am → vorbis/include/vorbis/Makefile.am
diff --git a/include/vorbis/Makefile.in → vorbis/include/vorbis/Makefile.in b/include/vorbis/Makefile.in → vorbis/include/vorbis/Makefile.in
diff --git a/include/vorbis/codec.h → vorbis/include/vorbis/codec.h b/include/vorbis/codec.h → vorbis/include/vorbis/codec.h
diff --git a/include/vorbis/vorbisenc.h → vorbis/include/vorbis/vorbisenc.h b/include/vorbis/vorbisenc.h → vorbis/include/vorbis/vorbisenc.h
diff --git a/include/vorbis/vorbisfile.h → vorbis/include/vorbis/vorbisfile.h b/include/vorbis/vorbisfile.h → vorbis/include/vorbis/vorbisfile.h
diff --git a/install-sh → vorbis/install-sh b/install-sh → vorbis/install-sh
diff --git a/lib/Makefile.am → vorbis/lib/Makefile.am b/lib/Makefile.am → vorbis/lib/Makefile.am
diff --git a/lib/Makefile.in → vorbis/lib/Makefile.in b/lib/Makefile.in → vorbis/lib/Makefile.in
diff --git a/lib/analysis.c → vorbis/lib/analysis.c b/lib/analysis.c → vorbis/lib/analysis.c
diff --git a/lib/backends.h → vorbis/lib/backends.h b/lib/backends.h → vorbis/lib/backends.h
diff --git a/lib/barkmel.c → vorbis/lib/barkmel.c b/lib/barkmel.c → vorbis/lib/barkmel.c
diff --git a/lib/bitrate.c → vorbis/lib/bitrate.c b/lib/bitrate.c → vorbis/lib/bitrate.c
diff --git a/lib/bitrate.h → vorbis/lib/bitrate.h b/lib/bitrate.h → vorbis/lib/bitrate.h
diff --git a/lib/block.c → vorbis/lib/block.c b/lib/block.c → vorbis/lib/block.c
diff --git a/lib/books/Makefile.am → vorbis/lib/books/Makefile.am b/lib/books/Makefile.am → vorbis/lib/books/Makefile.am
diff --git a/lib/books/Makefile.in → vorbis/lib/books/Makefile.in b/lib/books/Makefile.in → vorbis/lib/books/Makefile.in
diff --git a/lib/books/coupled/Makefile.am → vorbis/lib/books/coupled/Makefile.am b/lib/books/coupled/Makefile.am → vorbis/lib/books/coupled/Makefile.am
diff --git a/lib/books/coupled/Makefile.in → vorbis/lib/books/coupled/Makefile.in b/lib/books/coupled/Makefile.in → vorbis/lib/books/coupled/Makefile.in
diff --git a/lib/books/coupled/res_books_51.h → vorbis/lib/books/coupled/res_books_51.h b/lib/books/coupled/res_books_51.h → vorbis/lib/books/coupled/res_books_51.h
diff --git a/lib/books/coupled/res_books_stereo.h → vorbis/lib/books/coupled/res_books_stereo.h b/lib/books/coupled/res_books_stereo.h → vorbis/lib/books/coupled/res_books_stereo.h
diff --git a/lib/books/floor/Makefile.am → vorbis/lib/books/floor/Makefile.am b/lib/books/floor/Makefile.am → vorbis/lib/books/floor/Makefile.am
diff --git a/lib/books/floor/Makefile.in → vorbis/lib/books/floor/Makefile.in b/lib/books/floor/Makefile.in → vorbis/lib/books/floor/Makefile.in
diff --git a/lib/books/floor/floor_books.h → vorbis/lib/books/floor/floor_books.h b/lib/books/floor/floor_books.h → vorbis/lib/books/floor/floor_books.h
diff --git a/lib/books/uncoupled/Makefile.am → vorbis/lib/books/uncoupled/Makefile.am b/lib/books/uncoupled/Makefile.am → vorbis/lib/books/uncoupled/Makefile.am
diff --git a/lib/books/uncoupled/Makefile.in → vorbis/lib/books/uncoupled/Makefile.in b/lib/books/uncoupled/Makefile.in → vorbis/lib/books/uncoupled/Makefile.in
diff --git a/lib/books/uncoupled/res_books_uncoupled.h → ...lib/books/uncoupled/res_books_uncoupled.h b/lib/books/uncoupled/res_books_uncoupled.h → ...lib/books/uncoupled/res_books_uncoupled.h
diff --git a/lib/codebook.c → vorbis/lib/codebook.c b/lib/codebook.c → vorbis/lib/codebook.c
diff --git a/lib/codebook.h → vorbis/lib/codebook.h b/lib/codebook.h → vorbis/lib/codebook.h
diff --git a/lib/codec_internal.h → vorbis/lib/codec_internal.h b/lib/codec_internal.h → vorbis/lib/codec_internal.h
diff --git a/lib/envelope.c → vorbis/lib/envelope.c b/lib/envelope.c → vorbis/lib/envelope.c
diff --git a/lib/envelope.h → vorbis/lib/envelope.h b/lib/envelope.h → vorbis/lib/envelope.h
diff --git a/lib/floor0.c → vorbis/lib/floor0.c b/lib/floor0.c → vorbis/lib/floor0.c
diff --git a/lib/floor1.c → vorbis/lib/floor1.c b/lib/floor1.c → vorbis/lib/floor1.c
diff --git a/lib/highlevel.h → vorbis/lib/highlevel.h b/lib/highlevel.h → vorbis/lib/highlevel.h
diff --git a/lib/info.c → vorbis/lib/info.c b/lib/info.c → vorbis/lib/info.c
diff --git a/lib/lookup.c → vorbis/lib/lookup.c b/lib/lookup.c → vorbis/lib/lookup.c
diff --git a/lib/lookup.h → vorbis/lib/lookup.h b/lib/lookup.h → vorbis/lib/lookup.h
diff --git a/lib/lookup_data.h → vorbis/lib/lookup_data.h b/lib/lookup_data.h → vorbis/lib/lookup_data.h
diff --git a/lib/lookups.pl → vorbis/lib/lookups.pl b/lib/lookups.pl → vorbis/lib/lookups.pl
diff --git a/lib/lpc.c → vorbis/lib/lpc.c b/lib/lpc.c → vorbis/lib/lpc.c
diff --git a/lib/lpc.h → vorbis/lib/lpc.h b/lib/lpc.h → vorbis/lib/lpc.h
diff --git a/lib/lsp.c → vorbis/lib/lsp.c b/lib/lsp.c → vorbis/lib/lsp.c
diff --git a/lib/lsp.h → vorbis/lib/lsp.h b/lib/lsp.h → vorbis/lib/lsp.h
diff --git a/lib/mapping0.c → vorbis/lib/mapping0.c b/lib/mapping0.c → vorbis/lib/mapping0.c
diff --git a/lib/masking.h → vorbis/lib/masking.h b/lib/masking.h → vorbis/lib/masking.h
diff --git a/lib/mdct.c → vorbis/lib/mdct.c b/lib/mdct.c → vorbis/lib/mdct.c
diff --git a/lib/mdct.h → vorbis/lib/mdct.h b/lib/mdct.h → vorbis/lib/mdct.h
diff --git a/lib/misc.h → vorbis/lib/misc.h b/lib/misc.h → vorbis/lib/misc.h
diff --git a/lib/modes/Makefile.am → vorbis/lib/modes/Makefile.am b/lib/modes/Makefile.am → vorbis/lib/modes/Makefile.am
diff --git a/lib/modes/Makefile.in → vorbis/lib/modes/Makefile.in b/lib/modes/Makefile.in → vorbis/lib/modes/Makefile.in
diff --git a/lib/modes/floor_all.h → vorbis/lib/modes/floor_all.h b/lib/modes/floor_all.h → vorbis/lib/modes/floor_all.h
diff --git a/lib/modes/psych_11.h → vorbis/lib/modes/psych_11.h b/lib/modes/psych_11.h → vorbis/lib/modes/psych_11.h
diff --git a/lib/modes/psych_16.h → vorbis/lib/modes/psych_16.h b/lib/modes/psych_16.h → vorbis/lib/modes/psych_16.h
diff --git a/lib/modes/psych_44.h → vorbis/lib/modes/psych_44.h b/lib/modes/psych_44.h → vorbis/lib/modes/psych_44.h
diff --git a/lib/modes/psych_8.h → vorbis/lib/modes/psych_8.h b/lib/modes/psych_8.h → vorbis/lib/modes/psych_8.h
diff --git a/lib/modes/residue_16.h → vorbis/lib/modes/residue_16.h b/lib/modes/residue_16.h → vorbis/lib/modes/residue_16.h
diff --git a/lib/modes/residue_44.h → vorbis/lib/modes/residue_44.h b/lib/modes/residue_44.h → vorbis/lib/modes/residue_44.h
diff --git a/lib/modes/residue_44p51.h → vorbis/lib/modes/residue_44p51.h b/lib/modes/residue_44p51.h → vorbis/lib/modes/residue_44p51.h
diff --git a/lib/modes/residue_44u.h → vorbis/lib/modes/residue_44u.h b/lib/modes/residue_44u.h → vorbis/lib/modes/residue_44u.h
diff --git a/lib/modes/residue_8.h → vorbis/lib/modes/residue_8.h b/lib/modes/residue_8.h → vorbis/lib/modes/residue_8.h
diff --git a/lib/modes/setup_11.h → vorbis/lib/modes/setup_11.h b/lib/modes/setup_11.h → vorbis/lib/modes/setup_11.h
diff --git a/lib/modes/setup_16.h → vorbis/lib/modes/setup_16.h b/lib/modes/setup_16.h → vorbis/lib/modes/setup_16.h
diff --git a/lib/modes/setup_22.h → vorbis/lib/modes/setup_22.h b/lib/modes/setup_22.h → vorbis/lib/modes/setup_22.h
diff --git a/lib/modes/setup_32.h → vorbis/lib/modes/setup_32.h b/lib/modes/setup_32.h → vorbis/lib/modes/setup_32.h
diff --git a/lib/modes/setup_44.h → vorbis/lib/modes/setup_44.h b/lib/modes/setup_44.h → vorbis/lib/modes/setup_44.h
diff --git a/lib/modes/setup_44p51.h → vorbis/lib/modes/setup_44p51.h b/lib/modes/setup_44p51.h → vorbis/lib/modes/setup_44p51.h
diff --git a/lib/modes/setup_44u.h → vorbis/lib/modes/setup_44u.h b/lib/modes/setup_44u.h → vorbis/lib/modes/setup_44u.h
diff --git a/lib/modes/setup_8.h → vorbis/lib/modes/setup_8.h b/lib/modes/setup_8.h → vorbis/lib/modes/setup_8.h
diff --git a/lib/modes/setup_X.h → vorbis/lib/modes/setup_X.h b/lib/modes/setup_X.h → vorbis/lib/modes/setup_X.h
diff --git a/lib/os.h → vorbis/lib/os.h b/lib/os.h → vorbis/lib/os.h
diff --git a/lib/psy.c → vorbis/lib/psy.c b/lib/psy.c → vorbis/lib/psy.c
diff --git a/lib/psy.h → vorbis/lib/psy.h b/lib/psy.h → vorbis/lib/psy.h
diff --git a/lib/psytune.c.nocompile → vorbis/lib/psytune.c.nocompile b/lib/psytune.c.nocompile → vorbis/lib/psytune.c.nocompile
diff --git a/lib/registry.c → vorbis/lib/registry.c b/lib/registry.c → vorbis/lib/registry.c
diff --git a/lib/registry.h → vorbis/lib/registry.h b/lib/registry.h → vorbis/lib/registry.h
diff --git a/lib/res0.c → vorbis/lib/res0.c b/lib/res0.c → vorbis/lib/res0.c
diff --git a/lib/scales.h → vorbis/lib/scales.h b/lib/scales.h → vorbis/lib/scales.h
diff --git a/lib/sharedbook.c → vorbis/lib/sharedbook.c b/lib/sharedbook.c → vorbis/lib/sharedbook.c
diff --git a/lib/smallft.c → vorbis/lib/smallft.c b/lib/smallft.c → vorbis/lib/smallft.c
diff --git a/lib/smallft.h → vorbis/lib/smallft.h b/lib/smallft.h → vorbis/lib/smallft.h
diff --git a/lib/synthesis.c → vorbis/lib/synthesis.c b/lib/synthesis.c → vorbis/lib/synthesis.c
diff --git a/lib/tone.c → vorbis/lib/tone.c b/lib/tone.c → vorbis/lib/tone.c
diff --git a/lib/vorbisenc.c → vorbis/lib/vorbisenc.c b/lib/vorbisenc.c → vorbis/lib/vorbisenc.c
diff --git a/lib/vorbisfile.c → vorbis/lib/vorbisfile.c b/lib/vorbisfile.c → vorbis/lib/vorbisfile.c
diff --git a/lib/window.c → vorbis/lib/window.c b/lib/window.c → vorbis/lib/window.c
diff --git a/lib/window.h → vorbis/lib/window.h b/lib/window.h → vorbis/lib/window.h
diff --git a/libvorbis.spec → vorbis/libvorbis.spec b/libvorbis.spec → vorbis/libvorbis.spec
diff --git a/libvorbis.spec.in → vorbis/libvorbis.spec.in b/libvorbis.spec.in → vorbis/libvorbis.spec.in
diff --git a/ltmain.sh → vorbis/ltmain.sh b/ltmain.sh → vorbis/ltmain.sh
diff --git a/m4/Makefile.am → vorbis/m4/Makefile.am b/m4/Makefile.am → vorbis/m4/Makefile.am
diff --git a/m4/Makefile.in → vorbis/m4/Makefile.in b/m4/Makefile.in → vorbis/m4/Makefile.in