[xiph-commits] r8019 - in trunk/oggdsf/src/lib: codecs/flac/filters/dsfFLACEncoder codecs/speex/filters/dsfSpeexEncoder codecs/theora/filters/dsfTheoraEncoder codecs/vorbis/filters/dsfVorbisEncoder core/directshow/dsfOggMux

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2004-10-16 02:20:35 -0700 (Sat, 16 Oct 2004)
New Revision: 8019

Modified:
   trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h
   trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h
   trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h
   trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.h
   trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.h
Log:
* Fixed some of the encoders who's merit value was too high.
* Now the mux can handle both FLAC formats and will automatically convert to the new flac format as it muxes.

Modified: trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h	2004-10-16 09:02:26 UTC (rev 8018)
+++ trunk/oggdsf/src/lib/codecs/flac/filters/dsfFLACEncoder/flacencoderdllstuff.h	2004-10-16 09:20:35 UTC (rev 8019)
@@ -122,7 +122,7 @@
 
 const REGFILTER2 FLACEncodeFilterReg = {
 		1,
-		MERIT_NORMAL,
+		MERIT_DO_NOT_USE,
 		2,
         FLACEncodePinReg
 		

Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h	2004-10-16 09:02:26 UTC (rev 8018)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/speexencoderdllstuff.h	2004-10-16 09:20:35 UTC (rev 8019)
@@ -119,7 +119,7 @@
 
 const REGFILTER2 SpeexEncodeFilterReg = {
 		1,
-		MERIT_NORMAL,
+		MERIT_DO_NOT_USE,
 		2,
         SpeexEncodePinReg
 		

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h	2004-10-16 09:02:26 UTC (rev 8018)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraEncoder/theoraencoderdllstuff.h	2004-10-16 09:20:35 UTC (rev 8019)
@@ -106,7 +106,7 @@
 
 const REGFILTER2 TheoraEncodeFilterReg = {
 		1,
-		MERIT_NORMAL,
+		MERIT_DO_NOT_USE,
 		2,
         TheoraEncodePinReg
 		

Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.h	2004-10-16 09:02:26 UTC (rev 8018)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/vorbisencoderdllstuff.h	2004-10-16 09:20:35 UTC (rev 8019)
@@ -119,7 +119,7 @@
 
 const REGFILTER2 VorbisEncodeFilterReg = {
 		1,
-		MERIT_NORMAL,
+		MERIT_DO_NOT_USE,
 		2,
         VorbisEncodePinReg
 		

Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.h	2004-10-16 09:02:26 UTC (rev 8018)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/oggmuxdllstuff.h	2004-10-16 09:20:35 UTC (rev 8019)
@@ -121,6 +121,10 @@
 	{
 		&MEDIATYPE_Video,
 		&MEDIASUBTYPE_Theora
+	},
+	{
+		&MEDIATYPE_Audio,
+		&MEDIASUBTYPE_FLAC
 	}
 };
 const REGFILTERPINS OggMuxPinReg = {
@@ -132,7 +136,7 @@
 	FALSE,								//Cannot have more than one instance of this pin
 	NULL,								//Connects to filter (obsoleted)
 	NULL,								//Connects to pin (obsoleted)
-	4,									//upport two media type
+	5,									//upport two media type
 	OggMuxInputTypes					//Pointer to media type (Audio/Vorbis or Audio/Speex)
 };