- [Delphi]improved speed of theora video decoding

git-svn-id: http://zengl.googlecode.com/svn/branches/0.3.x@1948 6573c10b-8653-0410-9706-d32479e959fb

demos/Delphi 7/01 - Initialization VCL/demo01VCL.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/01 - Initialization VCL/demo01VCL.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;dbrtl;inet;inetdb;dsnap;bdertl;vclx;vcldb;vcldbx
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/01 - Initialization/demo01.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/01 - Initialization/demo01.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/02 - Resources/demo02.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/02 - Resources/demo02.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/03 - Input/demo03.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/03 - Input/demo03.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/04 - Screen Settings/demo04.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/04 - Screen Settings/demo04.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/05 - Primitives/demo05.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/05 - Primitives/demo05.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/06 - Text/demo06.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/06 - Text/demo06.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/07 - Sprites/demo07.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/07 - Sprites/demo07.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/08 - Sprite Engine/demo08.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/08 - Sprite Engine/demo08.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/09 - Sprite Engine(Classes)/demo09.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/09 - Sprite Engine(Classes)/demo09.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/10 - Tiles/demo10.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/10 - Tiles/demo10.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/11 - Grid/demo11.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/11 - Grid/demo11.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/12 - Render into Texture/demo12.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/12 - Render into Texture/demo12.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/13 - Particles/demo13.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/13 - Particles/demo13.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/14 - Sound/demo14.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/14 - Sound/demo14.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/15 - Video/demo15.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/15 - Video/demo15.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi 7/16 - Physics/demo16.cfg

@@ -35,10 +35,10 @@
 -N"../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

demos/Delphi 7/16 - Physics/demo16.dof

@@ -94,7 +94,7 @@ OutputDir=../../../bin/i386-win32
 UnitOutputDir=../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../../headers;../../../extra;../../../src;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../../headers;../../../extra;../../../src;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP
 Conditionals=
 DebugSourceDirs=

demos/Delphi XE 2/01 - Initialization VCL/demo01VCL.dproj

@@ -63,7 +63,7 @@
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_DcuOutput>..\tmp</DCC_DcuOutput>
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>

demos/Delphi XE 2/01 - Initialization/demo01.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/02 - Resources/demo02.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/03 - Input/demo03.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/04 - Screen Settings/demo04.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/05 - Primitives/demo05.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/06 - Text/demo06.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/07 - Sprites/demo07.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/08 - Sprite Engine/demo08.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/09 - Sprite Engine(Classes)/demo09.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/10 - Tiles/demo10.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/11 - Grid/demo11.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/12 - Render into Texture/demo12.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/13 - Particles/demo13.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/14 - Sound/demo14.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/15 - Video/demo15.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Delphi XE 2/16 - Physics/demo16.dproj

@@ -61,7 +61,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<DCC_ExeOutput>..\..\..\bin\i386-win32</DCC_ExeOutput>
-			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\..\src;..\..\..\headers;..\..\..\extra;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<DCC_UsePackage>bindcompvcl;vcltouch;vcldbx;VclSmp;IndySystem;IndyCore;vcl;dsnapcon;vclx;svnui;svn;vclimg;IndyProtocols;fmi;bdertl;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Locale>1033</VerInfo_Locale>

demos/Visual Studio 2008/08 - Sprite Engine/08 - Sprite Engine.vcproj

@@ -4,7 +4,7 @@
 	Version="9,00"
 	Name="08 - Sprite Engine"
 	ProjectGUID="{901DE1AC-ED60-49B1-BF75-B4C090F491EE}"
-	RootNamespace="My09SpriteEngine"
+	RootNamespace="My08SpriteEngine"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>

headers/zglHeader.h

@@ -3,7 +3,7 @@
 /*--------------------------------*/
 /*                                */
 /* version:  0.3.6                */
-/* date:     2012.11.08           */
+/* date:     2012.12.16           */
 /* license:  zlib                 */
 /* homepage: http://zengl.org     */
 /*                                */

headers/zglHeader.pas

@@ -3,7 +3,7 @@
 {--------------------------------}
 {                                }
 { version:  0.3.6                }
-{ date:     2012.11.08           }
+{ date:     2012.12.16           }
 { license:  zlib                 }
 { homepage: http://zengl.org     }
 {                                }

src/Delphi/Delphi 7/ZenGL.cfg

@@ -34,10 +34,10 @@
 -N"../../tmp"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"../../;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--O"../../;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--I"../../;../../../lib/zlib/delphi;../../../lib/zip/delphi"
--R"../../;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-U"../../;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-O"../../;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-I"../../;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
+-R"../../;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi"
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

src/Delphi/Delphi 7/ZenGL.dof

@@ -94,7 +94,7 @@ OutputDir=
 UnitOutputDir=../../tmp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=../../;../../../lib/zlib/delphi;../../../lib/zip/delphi
+SearchPath=../../;../../../lib/theora/delphi;../../../lib/zlib/delphi;../../../lib/zip/delphi
 Packages=vcl;rtl;vclx;vclactnband;dbrtl;adortl;vcldb;bdertl;vcldbx;visualclx;visualdbclx;dss;teeui;teedb;tee;ibxpress;dsnap;dsnapcon
 Conditionals=
 DebugSourceDirs=

src/Delphi/Delphi XE 2/ZenGL.dproj

@@ -61,7 +61,7 @@
 			<DCC_UsePackage>bindcompvcl;vcltouch;VclSmp;vcl;dsnapcon;vclx;vclimg;vclactnband;vcldb;vcldsnap;$(DCC_UsePackage)</DCC_UsePackage>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
-			<DCC_UnitSearchPath>..\..\;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
+			<DCC_UnitSearchPath>..\..\;..\..\..\lib\theora\delphi;..\..\..\lib\zlib\delphi;..\..\..\lib\zip\delphi;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
 			<DCC_ExeOutput>.\</DCC_ExeOutput>
 			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -89,7 +89,6 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
 			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<Manifest_File>None</Manifest_File>
 			<VerInfo_Locale>1033</VerInfo_Locale>
 		</PropertyGroup>
 		<ItemGroup>
@@ -150,6 +149,7 @@
 					<Platform value="OSX32">False</Platform>
 					<Platform value="Win32">True</Platform>
 				</Platforms>
+				<ModelSupport>False</ModelSupport>
 			</BorlandProject>
 			<ProjectFileVersion>12</ProjectFileVersion>
 		</ProjectExtensions>

src/zgl_main.pas

@@ -49,7 +49,7 @@ uses
 
 const
   cs_ZenGL    = 'ZenGL 0.3.6';
-  cs_Date     = '2012.12.10';
+  cs_Date     = '2012.12.16';
   cv_major    = 0;
   cv_minor    = 3;
   cv_revision = 6;

src/zgl_sound_ogg.pas

@@ -221,13 +221,10 @@ end;
 
 procedure ogg_LoadFromMemory( const Memory : zglTMemory; out Data : PByteArray; out Size, Format, Frequency : LongWord );
   var
-    bytesRead : Integer;
-    buffer    : Pointer;
-    _end      : Boolean;
-
-    _vi : pvorbis_info;
-    _vf : OggVorbis_File;
-    _vc : ov_callbacks;
+    _end : Boolean;
+    _vi  : pvorbis_info;
+    _vf  : OggVorbis_File;
+    _vc  : ov_callbacks;
 begin
   if not vorbisInit Then exit;
 

src/zgl_video_theora.pas

@@ -25,14 +25,8 @@ unit zgl_video_theora;
 
 {$I zgl_config.cfg}
 
-{$IFDEF FPC}
-  {$DEFINE YUV2RGBA_Robin_Watts}
-{$ENDIF}
-
-{$IFDEF YUV2RGBA_Robin_Watts}
-  {$L yuv2bgr16tab.o}
-  {$L yuv420rgb8888.o}
-{$ENDIF}
+{$L yuv2bgr16tab}
+{$L yuv420rgb8888}
 
 interface
 
@@ -62,10 +56,8 @@ type
     Time        : Double;
   end;
 
-{$IFDEF YUV2RGBA_Robin_Watts}
-procedure yuv420_2_rgb8888( dst_ptr, y_ptr, u_ptr, v_ptr : pcuint8; width, height, y_span, uv_span, dst_span : cint32; tables : pcuint32; dither : cint32 ); cdecl; external;
+procedure yuv420_2_rgb8888( dst_ptr, y_ptr, u_ptr, v_ptr : pcuchar; width, height, y_span, uv_span, dst_span : cint32; tables : pcuint32; dither : cint32 ); cdecl; external;
 function get_yuv2bgr565_table : pcuint32; cdecl; external;
-{$ENDIF}
 
 var
   theoraDecoderOGV : zglTVideoDecoder;
@@ -250,12 +242,7 @@ end;
 function theora_Update( var TheoraData : zglTTheoraData; Time : Double; Data : PByteArray ) : Integer;
   var
     ycbcr      : th_ycbcr_buffer;
-    {$IFDEF YUV2RGBA_Robin_Watts}
     dataOrig   : PByteArray;
-    {$ELSE}
-    Y, Cb, Cr  : Integer;
-    {$ENDIF}
-    i, j       : Integer;
     videoReady : Boolean;
     granulePos : ogg_int64_t;
     page       : ogg_page;
@@ -292,11 +279,10 @@ begin
       begin
         th_decode_ycbcr_out( TheoraData.DecoderCtx, @ycbcr );
 
-      {$IFDEF YUV2RGBA_Robin_Watts}
         dataOrig := Data;
         INC( PByte( Data ), ( ycbcr[ 0 ].height - 1 ) * ycbcr[ 0 ].width * 4 );
 
-        yuv420_2_rgb8888( pcuint8( Data ), ycbcr[ 0 ].data, ycbcr[ 1 ].data, ycbcr[ 2 ].data,
+        yuv420_2_rgb8888( pcuchar( Data ), ycbcr[ 0 ].data, ycbcr[ 1 ].data, ycbcr[ 2 ].data,
                           ycbcr[ 0 ].width, ycbcr[ 0 ].height,
                           ycbcr[ 0 ].stride, ycbcr[ 1 ].stride, -ycbcr[ 0 ].width * 4,
                           get_yuv2bgr565_table(), 0 );
@@ -313,32 +299,6 @@ begin
         {$ELSE}
         Data := dataOrig;
         {$ENDIF}
-      {$ELSE}
-        INC( PByte( Data ), ( ycbcr[ 0 ].height - 1 ) * ycbcr[ 0 ].width * 4 );
-        for j := 0 to ycbcr[ 0 ].height - 1 do
-          begin
-            for i := 0 to ycbcr[ 0 ].width - 1 do
-              begin
-                Y  := 9535 * ( PByteArray( ycbcr[ 0 ].data )[ i ] - 16 );
-                Cb := PByteArray( ycbcr[ 1 ].data )[ i shr 1 ] - 128;
-                Cr := PByteArray( ycbcr[ 2 ].data )[ i shr 1 ] - 128;
-
-                Data[ 0 ] := clamp( Y + 13074 * Cr ) shr 13;
-                Data[ 1 ] := clamp( Y - 6660 * Cr - 3203 * Cb ) shr 13;
-                Data[ 2 ] := clamp( Y + 16531 * Cb ) shr 13;
-                INC( PByte( Data ), 4 );
-              end;
-
-            DEC( PByte( Data ), ycbcr[ 0 ].width * 8 );
-            INC( ycbcr[ 0 ].data, ycbcr[ 0 ].stride );
-
-            if j and 1 > 0 Then
-              begin
-                INC( ycbcr[ 1 ].data, ycbcr[ 1 ].stride );
-                INC( ycbcr[ 2 ].data, ycbcr[ 2 ].stride );
-              end;
-          end;
-      {$ENDIF}
       end;
 end;