Collapse the Ogg demuxer, and the Theora, Vorbis and Speex decoders in the same 'xiph' plugin.

As the three decoders requires Ogg support, and requires an Ogg demuxer to play, enabling any one of them will then enable the ogg demuxer.

The Ogg demuxer, on its own, needs to know which of the three formats are enabled, or it will not be able to properly decode them.

With this change, only one plugin will need to load and know about Xiph formats and libraries.

--HG--
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c

1 files changed, 2 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f6785d60d..e7d334612 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@ xine-lib (1.1.90) (Unreleased)
   * Move modplug demuxing on its own plugin, this way binary distributions
     can make it optional, as it requires quite a bit of CPU time during
     initialisation, even for audio files that nothing have to do with modplug.
+  * Collapse the Ogg demuxer, and the Theora, Vorbis and Speex decoders in the
+    same 'xiph' plugin.
 
 xine-lib (1.1.7) (unreleased)
   * Support libdca (new name for libdts) by shuffling around the dts.h file.