[xiph-commits] r8449 - in trunk/oggdsf: build/oggcodecs
src/lib/codecs/cmml/dsfCMMLRawSource
src/lib/core/ogg/libOOOgg src/tests/testLibOOOgg
src/tools/AnxCutter src/tools/OOOggSeekFileReader
illiminable at motherfish-iii.xiph.org
illiminable at motherfish-iii.xiph.org
Thu Dec 16 06:44:10 PST 2004
Author: illiminable
Date: 2004-12-16 06:44:10 -0800 (Thu, 16 Dec 2004)
New Revision: 8449
Modified:
trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp
trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj
trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp
trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj
Log:
* Added the option in the paginator to limit the number of packets on each page.
* Fixed a bug in the seekfile reader.
* Changed props so no Line ending issues for other platforms.
Modified: trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj
===================================================================
--- trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/build/oggcodecs/oggcodecs.vdproj 2004-12-16 14:44:10 UTC (rev 8449)
@@ -87,198 +87,198 @@
}
"Entry"
{
- "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
- "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"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:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
+ "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_46A378A9B03E4612A645053EDB884C20"
+ "MsmKey" = "8:_37172A348F2F449696731FD35BDCFE5B"
"OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
+ "MsmKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "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"
@@ -328,347 +328,335 @@
"Entry"
{
"MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
+ "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
+ "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
+ "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
+ "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "MsmKey" = "8:_8B57C7289F10C058A4E606BDCC6C9CFC"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "MsmKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "MsmKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
+ "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
+ "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
+ "MsmKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
+ "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
+ "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
+ "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
+ "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
+ "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
+ "MsmKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
+ "MsmKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
+ "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_02E7D9728C8944F1BD021329177F5140"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_AC8962A7F212481095173AB7C8C89025"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_655D5383153A6AB10D15352A7EABCC7A"
- "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_7AB5CD19FE0405AE176371917792D12E"
- "OwnerKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_8976C400668B453CB941859C4F3C6E27"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_81A3CDB604B64763884C387192BE6771"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_83AF8D74700947168B69E69E5160F082"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_83AF8D74700947168B69E69E5160F082"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_65015192414F476999A68339F89BEA57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8976C400668B453CB941859C4F3C6E27"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_5F037C77C35B4B5098153851ADDB7B6A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8D9A2E4C592D4118B80A4AE8394D8963"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_5EB08DD30B564283AA9C9F27D80CF9E4"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8F970C0B2593413CA2A3BBF5F2600387"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_58F56CD02F64413B9459F3E151760A57"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_8FDBDF6B593E4A31BDEECAA245B32EB0"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_578B89273D59478F861AA5BC3600D074"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_950B983745EC40EF9FF08E742A6E9510"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_56CADC6C2BCD4C178BC0C0AA13ABFEBF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_A5AAB8CB90C548F1820BC101A765616C"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_4EB6175B98B54613A5087D8EA257D00A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_AC8962A7F212481095173AB7C8C89025"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_408749AC43894882BEEBFF43737E505B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_B9749E2A902A46BEAE555C07E32980BB"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_3C7C3E6B832E481C8A36701A33FF3721"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_C6ED1B8B0AAC495E9D25CDE58FC9E711"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_3243E453AFD94BB88B5A1014BDFCBAAE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D2048C8B212841C88E42F6ADDCA8B0A2"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_273D851AE72C4D2EA8020A712DBFE5A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D3E41A5878FC4EC0B0F443CF3E5991BA"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_24A1793CB89A464FB683A8A3BDA774DB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_D9BE90D398094F15B881B22369C3A231"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_14E3067B71584FB5A245A2DA9D65D139"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DB60960DC12343B89500B86D5AB10D02"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_141113E874984C0483C694B14F3C16A3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_DCF4ED7597F8492AA49DC521111ED0F5"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_13E9F6D7ED35430BA31BDDF95E6327B3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E1E372FA955046E6928BF533EA0AE6C3"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_0D0DD40A31F842C68B09BE0CBDE1996B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_E4B8E67DA0E54BB3BB025BFCF536BF3B"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ "OwnerKey" = "8:_0A1E63E5852E4F759F1A27E8F097727B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_EB09F87C612C40BCA34AC87060CFEFF1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_EFEA71FFF2864107815DBDECCCCA1178"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_FD547F0196C24DFBB9CAFCCEC06561BC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -823,10 +811,10 @@
"IsDependency" = "11:FALSE"
"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:"
@@ -838,8 +826,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:"
}
@@ -879,14 +867,14 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
+ "Exclude" = "11:TRUE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_7AB5CD19FE0405AE176371917792D12E"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_81A3CDB604B64763884C387192BE6771"
{
- "SourcePath" = "8:libFLAC.dll"
- "TargetName" = "8:libFLAC.dll"
+ "SourcePath" = "8:..\\..\\COPYRIGHTS"
+ "TargetName" = "8:COPYRIGHTS"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -899,14 +887,14 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:TRUE"
- "IsDependency" = "11:TRUE"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
- "{A582A373-4685-4296-BEFE-614B80A702C3}:_81A3CDB604B64763884C387192BE6771"
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_8B57C7289F10C058A4E606BDCC6C9CFC"
{
- "SourcePath" = "8:..\\..\\COPYRIGHTS"
- "TargetName" = "8:COPYRIGHTS"
+ "SourcePath" = "8:libFLAC.dll"
+ "TargetName" = "8:libFLAC.dll"
"Tag" = "8:"
"Folder" = "8:_371AD289B6DB4693BDF7568485051F1E"
"Condition" = "8:"
@@ -919,8 +907,8 @@
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
+ "Exclude" = "11:TRUE"
+ "IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{A582A373-4685-4296-BEFE-614B80A702C3}:_8FDBDF6B593E4A31BDEECAA245B32EB0"
@@ -1019,7 +1007,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:oggcodecs"
"ProductCode" = "8:{D65F0073-A820-4085-B997-A061171595A7}"
- "PackageCode" = "8:{7E948D03-FC58-4A5E-BEE7-67C6F04BF4C9}"
+ "PackageCode" = "8:{B958AF43-C156-45F7-9114-DD842A2D713C}"
"UpgradeCode" = "8:{1A644FEB-7597-4FAB-AADE-C2C7C64C5984}"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
@@ -3142,12 +3130,40 @@
}
"MergeModule"
{
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_37172A348F2F449696731FD35BDCFE5B"
+ {
+ "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}:_F77F89EFB26C4C19A9EFD9A207FBC2F9"
+ {
+ "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"
@@ -3175,7 +3191,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"
@@ -3203,7 +3219,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"
@@ -3231,7 +3247,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"
@@ -3259,7 +3275,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"
@@ -3287,7 +3303,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"
@@ -3315,7 +3331,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"
@@ -3343,7 +3359,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"
@@ -3371,7 +3387,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"
@@ -3399,7 +3415,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"
@@ -3427,7 +3443,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"
@@ -3455,7 +3471,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"
@@ -3483,7 +3499,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"
@@ -3511,7 +3527,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"
@@ -3539,7 +3555,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"
@@ -3567,7 +3583,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"
@@ -3595,7 +3611,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"
@@ -3623,7 +3639,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"
@@ -3651,7 +3667,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"
@@ -3679,7 +3695,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"
@@ -3707,7 +3723,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"
@@ -3735,7 +3751,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"
@@ -3763,7 +3779,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"
@@ -3791,7 +3807,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"
@@ -3819,7 +3835,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"
@@ -3847,7 +3863,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"
@@ -3875,7 +3891,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"
@@ -3903,7 +3919,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"
@@ -3931,7 +3947,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"
@@ -3959,7 +3975,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"
@@ -3987,7 +4003,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"
@@ -4015,7 +4031,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"
@@ -4043,7 +4059,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"
@@ -4071,7 +4087,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"
@@ -4099,7 +4115,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"
@@ -4127,7 +4143,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/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/lib/codecs/cmml/dsfCMMLRawSource/CMMLRawSourcePin.cpp 2004-12-16 14:44:10 UTC (rev 8449)
@@ -158,6 +158,7 @@
memcpy((void*)locOutBuffer, (const void*)locNarrowStr.c_str(), locNarrowStr.size());
+ if (inTag->ta
locSample->SetActualDataLength(locNarrowStr.size());
@@ -165,4 +166,4 @@
return Deliver(locSample);
-}
\ No newline at end of file
+}
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp 2004-12-16 14:44:10 UTC (rev 8449)
@@ -273,7 +273,7 @@
//
//Every header gets it's own page.
- if ((mPacketCount < mSettings->mNumHeaders) && (mPendingPageHasData)) {
+ if (((mPacketCount < mSettings->mNumHeaders) || (mPacketCount >= mSettings->mMaxPacksPerPage)) && (mPendingPageHasData)) {
//debugLog<<"Flushing a header page..."<<endl;
//debugLog<<"PacketCount = "<<mPacketCount<<endl;
//debugLog<<"Num Headers = "<<mSettings->mNumHeaders<<endl;
@@ -449,4 +449,3 @@
return mSettings->mNumHeaders;
}
-
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.cpp 2004-12-16 14:44:10 UTC (rev 8449)
@@ -1,3 +1,4 @@
+<<<<<<< .mine
//===========================================================================
//Copyright (C) 2003, 2004 Zentaro Kavanagh
//
@@ -38,9 +39,58 @@
, mTargetPageSize(4096)
, mMinPageSize(4096)
, mNumHeaders(0)
+ , mMaxPacksPerPage(1)
{
}
OggPaginatorSettings::~OggPaginatorSettings(void)
{
}
+=======
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#include "stdafx.h"
+#include "OggPaginatorSettings.h"
+
+OggPaginatorSettings::OggPaginatorSettings(void)
+ : mSerialNo(0)
+ , mMaxPageSize(8192)
+ , mTargetPageSize(4096)
+ , mMinPageSize(4096)
+ , mNumHeaders(0)
+{
+}
+
+OggPaginatorSettings::~OggPaginatorSettings(void)
+{
+}
+>>>>>>> .r8448
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginatorSettings.h 2004-12-16 14:44:10 UTC (rev 8449)
@@ -1,3 +1,4 @@
+<<<<<<< .mine
//===========================================================================
//Copyright (C) 2003, 2004 Zentaro Kavanagh
//
@@ -42,5 +43,54 @@
unsigned long mTargetPageSize;
unsigned long mMinPageSize;
unsigned long mNumHeaders;
+ unsigned long mMaxPacksPerPage;
};
+=======
+//===========================================================================
+//Copyright (C) 2003, 2004 Zentaro Kavanagh
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//- Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//- Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+//- Neither the name of Zentaro Kavanagh nor the names of contributors
+// may be used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+//PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+//CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//===========================================================================
+
+#pragma once
+
+class LIBOOOGG_API OggPaginatorSettings
+{
+public:
+ OggPaginatorSettings(void);
+ ~OggPaginatorSettings(void);
+
+ unsigned long mSerialNo;
+ unsigned long mMaxPageSize;
+ unsigned long mTargetPageSize;
+ unsigned long mMinPageSize;
+ unsigned long mNumHeaders;
+
+};
+>>>>>>> .r8448
Modified: trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp
===================================================================
--- trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/tests/testLibOOOgg/testLibOOOgg.cpp 2004-12-16 14:44:10 UTC (rev 8449)
@@ -152,7 +152,7 @@
}
-int _tmain(int argc, _TCHAR* argv[])
+int __cdecl _tmain(int argc, _TCHAR* argv[])
{
int x;
cin>>x;
@@ -161,4 +161,3 @@
test255MultPacketSizesToFile("d:\\Zen\\tests\\test.ogg", 500);
return 0;
}
-
Modified: trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj
===================================================================
--- trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/tools/AnxCutter/AnxCutter.vcproj 2004-12-16 14:44:10 UTC (rev 8449)
@@ -70,7 +70,7 @@
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;.;..\..\lib\helper\libilliCore"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="4"
+ RuntimeLibrary="2"
UsePrecompiledHeader="3"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
Modified: trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.cpp 2004-12-16 14:44:10 UTC (rev 8449)
@@ -9,11 +9,7 @@
#include <fstream>
using namespace std;
-#ifdef WIN32
int __cdecl _tmain(int argc, _TCHAR* argv[])
-#else
-int main(int argc, char * argv[])
-#endif
{
if (argc < 2) {
@@ -31,19 +27,18 @@
while (!seekFile.eof()) {
//Read the time
seekFile.read((char*)buff, 8);
- timePoint = iLE_Math::CharArrToInt64(buff);
+ if (seekFile.gcount() == 8) {
+ timePoint = iLE_Math::CharArrToInt64(buff);
- //Read the byte offset
- seekFile.read((char*)buff, 4);
- bytePos = iLE_Math::charArrToULong(buff);
- cout << "Seek point "<<pointCount<<" : Time = "<<timePoint<<", Byte Offset = "<<bytePos<<endl;
+ seekFile.read((char*)buff, 4);
+ bytePos = iLE_Math::charArrToULong(buff);
-
+ cout << "Seek point "<<pointCount<<" : Time = "<<timePoint<<", Byte Offset = "<<bytePos<<endl;
+ }
}
- delete buff;
+ delete [] buff;
}
return 0;
}
-
Modified: trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj
===================================================================
--- trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj 2004-12-16 14:20:05 UTC (rev 8448)
+++ trunk/oggdsf/src/tools/OOOggSeekFileReader/OOOggSeekFileReader.vcproj 2004-12-16 14:44:10 UTC (rev 8449)
@@ -68,7 +68,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\lib\core\ogg\libOOOgg;"
+ AdditionalIncludeDirectories="..\..\lib\helper\libilliCore"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="3"
More information about the commits
mailing list