[xiph-commits] r8487 - in trunk/oggdsf: build/oggcodecs
src/lib/core/directshow/dsfAnxDemux
src/lib/core/directshow/dsfAnxMux
src/lib/core/directshow/dsfOggMux src/lib/core/ogg/libOOOgg
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Sun Dec 19 00:58:02 PST 2004
Author: illiminable
Date: 2004-12-19 00:58:02 -0800 (Sun, 19 Dec 2004)
New Revision: 8487
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h
trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
Log:
* Fixed mux concurrency crash
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-19 08:58:02 UTC (rev 8487)
@@ -105,540 +105,546 @@
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_4812D148C77C9833CE1C0D8D175B84A4"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
+ "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_8B26E3F4FB484770A673D79F10E9E6D1"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5752F7DAA54F2A09A6DC1D6BEB922BDD"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "MsmKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
+ "MsmKey" = "8:_D311FA49DB1A4D81839AF1AED857B1A6"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "MsmKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_B2784574F1B848EABBE013669B46808C"
+ "MsmKey" = "8:_D7835E050C942DE27CB20AF3D1EC70F4"
"OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B6A0B75A2A7A47922297CCEFC5F6F6BA"
- "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -855,10 +861,10 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_46A378A9B03E4612A645053EDB884C20"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_4812D148C77C9833CE1C0D8D175B84A4"
{
- "SourcePath" = "8:MSVCP71D.dll"
- "TargetName" = "8:MSVCP71D.dll"
+ "SourcePath" = "8:msxml3.dll"
+ "TargetName" = "8:msxml3.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -870,8 +876,8 @@
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Register" = "3:4"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
@@ -955,7 +961,7 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_B2784574F1B848EABBE013669B46808C"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_D7835E050C942DE27CB20AF3D1EC70F4"
{
"SourcePath" = "8:libFLAC.dll"
"TargetName" = "8:libFLAC.dll"
@@ -975,26 +981,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_B6A0B75A2A7A47922297CCEFC5F6F6BA"
- {
- "SourcePath" = "8:libOOOgg.dll"
- "TargetName" = "8:libOOOgg.dll"
- "Tag" = "8:"
- "Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:TRUE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{A582A373-4685-4296-BEFE-614B80A702C3}:_D9BE90D398094F15B881B22369C3A231"
{
"SourcePath" = "8:..\\..\\VERSIONS"
@@ -1071,7 +1057,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{79C906F9-3E83-4C28-BF9E-B9A45284BF98}"
+ "PackageCode" = "8:{685CB70A-2D95-4352-92B3-DB63F95D0114}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3194,12 +3180,40 @@
}
"MergeModule"
{
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_8B26E3F4FB484770A673D79F10E9E6D1"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
+ "Properties"
+ {
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_D311FA49DB1A4D81839AF1AED857B1A6"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
+ "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
+ "Properties"
+ {
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
}
"ProjectOutput"
{
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_02E7D9728C8944F1BD021329177F5140"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Debug\\libCMMLTags.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libCMMLTags\\Release\\libCMMLTags.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3227,7 +3241,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0A1E63E5852E4F759F1A27E8F097727B"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Debug\\OOOggDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggDump\\Release\\OOOggDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3255,7 +3269,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_0D0DD40A31F842C68B09BE0CBDE1996B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Debug\\dsfFLACEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACEncoder\\Release\\dsfFLACEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3283,7 +3297,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_13E9F6D7ED35430BA31BDDF95E6327B3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Debug\\dsfAbstractVideoEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAbstractVideoEncoder\\Release\\dsfAbstractVideoEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3311,7 +3325,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_141113E874984C0483C694B14F3C16A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxMux\\Debug\\dsfAnxMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxMux\\Release\\dsfAnxMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3339,7 +3353,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_14E3067B71584FB5A245A2DA9D65D139"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Debug\\libWinCMMLParse.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\libWinCMMLParse\\Release\\libWinCMMLParse.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3367,7 +3381,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_24A1793CB89A464FB683A8A3BDA774DB"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Debug\\vorbis_d.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\libs\\libvorbis\\win32\\Vorbis_Dynamic_Release\\vorbis.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3395,7 +3409,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_273D851AE72C4D2EA8020A712DBFE5A3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Debug\\dsfNativeFLACSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfNativeFLACSource\\Release\\dsfNativeFLACSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3423,7 +3437,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3243E453AFD94BB88B5A1014BDFCBAAE"
{
- "SourcePath" = "8:..\\..\\src\\tests\\testLibOOOgg\\Debug\\testLibOOOgg.exe"
+ "SourcePath" = "8:..\\..\\src\\tests\\testLibOOOgg\\Release\\testLibOOOgg.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3451,7 +3465,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_3C7C3E6B832E481C8A36701A33FF3721"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Debug\\OOOggStat.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggStat\\Release\\OOOggStat.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3479,7 +3493,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_408749AC43894882BEEBFF43737E505B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Debug\\dsfSpeexDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexDecoder\\Release\\dsfSpeexDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3507,7 +3521,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_4EB6175B98B54613A5087D8EA257D00A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Debug\\libOOTheora.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\libs\\libOOTheora\\Release\\libOOTheora.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3535,7 +3549,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Debug\\dsfTheoraDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraDecoder\\Release\\dsfTheoraDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3563,7 +3577,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_578B89273D59478F861AA5BC3600D074"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Debug\\dsfOggMux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggMux\\Release\\dsfOggMux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3591,7 +3605,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_58F56CD02F64413B9459F3E151760A57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Debug\\libOOOgg.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOgg\\Release\\libOOOgg.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3619,7 +3633,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5EB08DD30B564283AA9C9F27D80CF9E4"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Debug\\libOOOggSeek.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libOOOggSeek\\Release\\libOOOggSeek.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3647,7 +3661,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_5F037C77C35B4B5098153851ADDB7B6A"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLRawSource\\Debug\\dsfCMMLRawSource.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLRawSource\\Release\\dsfCMMLRawSource.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3675,7 +3689,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_65015192414F476999A68339F89BEA57"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Debug\\dsfCMMLDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\cmml\\dsfCMMLDecoder\\Release\\dsfCMMLDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3703,7 +3717,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_83AF8D74700947168B69E69E5160F082"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3731,7 +3745,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8976C400668B453CB941859C4F3C6E27"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Debug\\dsfFLACDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\filters\\dsfFLACDecoder\\Release\\dsfFLACDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3759,7 +3773,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8D9A2E4C592D4118B80A4AE8394D8963"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Debug\\dsfSpeexEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\speex\\filters\\dsfSpeexEncoder\\Release\\dsfSpeexEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3787,7 +3801,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8F970C0B2593413CA2A3BBF5F2600387"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Debug\\dsfAnxDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfAnxDemux\\Release\\dsfAnxDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3815,7 +3829,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_950B983745EC40EF9FF08E742A6E9510"
{
- "SourcePath" = "8:..\\..\\src\\tools\\anxcutter\\debug\\AnxCutter.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\AnxCutter\\Release\\AnxCutter.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3843,7 +3857,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A5AAB8CB90C548F1820BC101A765616C"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Debug\\dsfSeeking.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSeeking\\Release\\dsfSeeking.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3871,7 +3885,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_AC8962A7F212481095173AB7C8C89025"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Debug\\dsfTheoraEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\theora\\filters\\dsfTheoraEncoder\\Release\\dsfTheoraEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3899,7 +3913,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_B9749E2A902A46BEAE555C07E32980BB"
{
- "SourcePath" = "8:..\\..\\src\\tools\\oooggseekfilemaker\\debug\\OOOggSeekFileMaker.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileMaker\\Release\\OOOggSeekFileMaker.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3927,7 +3941,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Debug\\OOOggValidate.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggValidate\\Release\\OOOggValidate.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3955,7 +3969,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D2048C8B212841C88E42F6ADDCA8B0A2"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Debug\\dsfSubtitleVMR9.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfSubtitleVMR9\\Release\\dsfSubtitleVMR9.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -3983,7 +3997,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D3E41A5878FC4EC0B0F443CF3E5991BA"
{
- "SourcePath" = "8:..\\..\\src\\tools\\oooggseekfilereader\\debug\\OOOggSeekFileReader.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggSeekFileReader\\Release\\OOOggSeekFileReader.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4011,7 +4025,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DB60960DC12343B89500B86D5AB10D02"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\debug\\bin\\libFLAC++.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\flac\\libs\\libflac\\obj\\release\\bin\\libFLAC++.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4039,7 +4053,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_DCF4ED7597F8492AA49DC521111ED0F5"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Debug\\dsfOggDemux.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\directshow\\dsfOggDemux\\Release\\dsfOggDemux.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4067,7 +4081,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E1E372FA955046E6928BF533EA0AE6C3"
{
- "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Debug\\libVorbisComment.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\core\\ogg\\libVorbisComment\\Release\\libVorbisComment.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4095,7 +4109,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Debug\\libfishsound.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\helper\\libfishsound\\win32\\Release\\libfishsound.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4123,7 +4137,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EB09F87C612C40BCA34AC87060CFEFF1"
{
- "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Debug\\OOOggCommentDump.exe"
+ "SourcePath" = "8:..\\..\\src\\tools\\OOOggCommentDump\\Release\\OOOggCommentDump.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4151,7 +4165,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EFEA71FFF2864107815DBDECCCCA1178"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Debug\\dsfVorbisDecoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisDecoder\\Release\\dsfVorbisDecoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
@@ -4179,7 +4193,7 @@
}
"{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_FD547F0196C24DFBB9CAFCCEC06561BC"
{
- "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Debug\\dsfVorbisEncoder.dll"
+ "SourcePath" = "8:..\\..\\src\\lib\\codecs\\vorbis\\filters\\dsfVorbisEncoder\\Release\\dsfVorbisEncoder.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.cpp 2004-12-19 08:58:02 UTC (rev 8487)
@@ -46,12 +46,12 @@
, mAnnodexHeader(NULL)
{
- //debugLog.open("G:\\logs\\anxmapper.log", ios_base::out);
+ debugLog.open("G:\\logs\\anxmapper.log", ios_base::out);
}
AnxStreamMapper::~AnxStreamMapper(void)
{
- //debugLog.close();
+ debugLog.close();
}
bool AnxStreamMapper::isReady() {
@@ -82,9 +82,9 @@
}
//=======================================================================
if (locWasAny && retVal) {
- //debugLog<<"Streams READY"<<endl;
+ debugLog<<"Streams READY"<<endl;
} else {
- //debugLog<<"Streams NOT READY"<<endl;
+ debugLog<<"Streams NOT READY"<<endl;
}
return locWasAny && retVal;
}
@@ -150,6 +150,7 @@
vector<unsigned long>::iterator it;
int i = 0;
+ debugLog<<"handleAnxVersion_2_0 : State = "<<mDemuxState<<endl;
switch (mDemuxState) {
case SEEN_NOTHING:
//debugLog<<"SEEN_NOTHING"<<endl;
@@ -221,18 +222,18 @@
// The CMML stream is already made.
for(i = 0, it = mSeenStreams.begin(); it != mSeenStreams.end(); i++, ++it) {
-
+ debugLog<<"handleAnxVersion_2_0 : Checking seen stream "<<i<<endl;
if (mSeenStreams[i] == inOggPage->header()->StreamSerialNo()) {
//If the page is a BOS we need to start a new stream
const bool ALLOW_OTHERS_TO_SEEK = true;
- //debugLog<<"Creating strem.... ***"<<endl;
+ debugLog<<"handleAnxVersion_2_0 : Creating stream "<<endl;
OggStream* locStream = OggStreamFactory::CreateStream(inOggPage, mOwningFilter, ALLOW_OTHERS_TO_SEEK);
//FIX::: Need to check for NULL
if (locStream != NULL) {
- //debugLog<<"Creating strem.... ***"<<endl;
+ debugLog<<"handleAnxVersion_2_0 : Stream Created "<<endl;
mStreamList.push_back(locStream);
} else {
- //debugLog<<"Lost a packet..."<<endl;
+ debugLog<<"handleAnxVersion_2_0 : ***** Stream NOT Created *****"<<endl;
}
mSeenStreams.erase(it);
delete inOggPage;
@@ -242,19 +243,19 @@
//If we are here, the stream is not in the list.
//At the moment we assume it's because it's been seen, and removed... this is a bad assumption !
- //debugLog<<"Dispatchinig.........."<<endl;
+ debugLog<<"handleAnxVersion_2_0 : Dispatching page "<<endl;
locTemp = dispatchPage(inOggPage);
if (locTemp) {
- //debugLog<<"Dispatch ok"<<endl;
+ debugLog<<"handleAnxVersion_2_0 : Sispatch oK "<<endl;
} else {
- //debugLog<<"Dispatch failed"<<endl;
+ debugLog<<"handleAnxVersion_2_0 : Dispatch faild "<<endl;
}
return locTemp;
break;
case INVALID_STATE:
default:
- //debugLog<<"INVALID"<<endl;
+ debugLog<<"handleAnxVersion_2_0 : INVALID STATE "<<endl;
return false;
break;
@@ -379,6 +380,7 @@
}
bool AnxStreamMapper::toStartOfData() {
+ debugLog<<"toStartOfData : S "<<endl;
//Specialise for anx... adds one extra ignore packet to the flush to account for the anxdata pages only
// if it's 2.0 version.
//debugLog<<"ANX::: To start of data size = "<<mStreamList.size()<<endl;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxDemux/AnxStreamMapper.h 2004-12-19 08:58:02 UTC (rev 8487)
@@ -88,5 +88,7 @@
vector<OggPacket*> mAnxDataHeaders;
unsigned long mAnxVersion;
eAnxDemuxState mDemuxState;
+
+ fstream debugLog;
};
Modified: trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/directshow/dsfAnxMux/AnxPageInterleaver.cpp 2004-12-19 08:58:02 UTC (rev 8487)
@@ -100,10 +100,10 @@
bool locIsOK = true;
for (int i = 0; i < mInputStreams.size(); i++) {
if (mInputStreams[i]->isActive()) {
- locWasAny = true;
+
//if ((mInputStreams[i]->peekFront() != NULL) || (!mInputStreams[i]->isActive())) {
if (mInputStreams[i]->numAvail() > 1) {
-
+ locWasAny = true;
locIsOK = locIsOK && true;
} else {
locIsOK = false;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.cpp 2004-12-19 08:58:02 UTC (rev 8487)
@@ -99,6 +99,7 @@
//LEAK CHECK:::Both get deleted in constructor.
m_pLock = new CCritSec;
+ mStreamLock = new CCritSec;
mInputPins.push_back(new OggMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
//debugLog.open("C:\\temp\\muxer.log", ios_base::out);
@@ -118,6 +119,7 @@
m_pLock = new CCritSec;
+ mStreamLock = new CCritSec;
//In the derived class
//mInputPins.push_back(new OggMuxInputPin(this, m_pLock, &mHR, mInterleaver->newStream()));
@@ -135,6 +137,7 @@
//debugLog.close();
//DbgLog((LOG_ERROR, 1, TEXT("****************** DESTRUCTOR **********************")));
delete m_pLock;
+ delete mStreamLock;
//Need to delete the pins !!
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxFilter.h 2004-12-19 08:58:02 UTC (rev 8487)
@@ -58,6 +58,7 @@
virtual ~OggMuxFilter(void);
+ friend class OggMuxInputPin;
//Com Stuff
DECLARE_IUNKNOWN
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
@@ -95,6 +96,8 @@
OggPageInterleaver* mInterleaver;
+ CCritSec* mStreamLock;
+
fstream mOutputFile;
//fstream debugLog;
HRESULT mHR;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.cpp 2004-12-19 08:58:02 UTC (rev 8487)
@@ -205,6 +205,7 @@
}
STDMETHODIMP OggMuxInputPin::Receive(IMediaSample* inSample) {
+ CAutoLock locLock(mParentFilter->mStreamLock);
LONGLONG locStart = 0;
LONGLONG locEnd = 0;
BYTE* locSampleBuff;
Modified: trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/directshow/dsfOggMux/OggMuxInputPin.h 2004-12-19 08:58:02 UTC (rev 8487)
@@ -50,6 +50,7 @@
OggMuxInputPin(OggMuxFilter* inParentFilter, CCritSec* inFilterLock, HRESULT* inHR, OggMuxStream* inMuxStream);
virtual ~OggMuxInputPin(void);
+
//COM Setup
DECLARE_IUNKNOWN
STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void **ppv);
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-12-19 08:58:02 UTC (rev 8487)
@@ -62,6 +62,10 @@
}
bool OggMuxStream::acceptOggPage(OggPage* inOggPage) { //Holds page for later... still needs deleting in destructor
mIsEOS = false;
+ if (inOggPage == NULL) {
+ int x = 0;
+ x= x/x;
+ }
mPageQueue.push_back(inOggPage); //AOP::: Clone not required.
mNotifier->notifyArrival();
return true;
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-19 07:09:33 UTC (rev 8486)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp 2004-12-19 08:58:02 UTC (rev 8487)
@@ -119,6 +119,10 @@
for (size_t i = 0; i < mInputStreams.size(); i++) {
if (!mInputStreams[i]->isEmpty() && mInputStreams[i]->isActive()) {
if (locLowestStream == NULL) {
+ if (mInputStreams[i]->peekFront() == NULL) {
+ int x = 0;
+ x= x/x;
+ }
locLowestStream = mInputStreams[i];
//debugLog<<"writeLowest : Defaulting stream "<<i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
//debugLog<<"writeLowest : Defaulting stream "<<i<<endl;
More information about the commits
mailing list