Re #1937: Change project and folder name for consistency with existing third party library.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5358 74dad513-b988-da41-8d7b-12977e46ad98

78 files changed, 228 insertions, 228 deletions

diff --git a/pjmedia/src/pjmedia/converter_libyuv.c b/pjmedia/src/pjmedia/converter_libyuv.c
index 86723096..fbe3225d 100644
--- a/pjmedia/src/pjmedia/converter_libyuv.c
+++ b/pjmedia/src/pjmedia/converter_libyuv.c
@@ -22,7 +22,7 @@
 
 #if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
 
-#include "../../third_party/libyuv/include/libyuv.h"
+#include "../../third_party/yuv/include/libyuv.h"
 
 static pj_status_t factory_create_converter(pjmedia_converter_factory *cf,
 					    pj_pool_t *pool,
diff --git a/pjproject-vs14.sln b/pjproject-vs14.sln
index d581ff98..1d0693ba 100644
--- a/pjproject-vs14.sln
+++ b/pjproject-vs14.sln
@@ -80,7 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbaseclasses", "third_par
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua2_lib", "pjsip\build\pjsua2_lib.vcxproj", "{B82CDD25-6903-430E-BD38-D8129A2015C1}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibyuv", "third_party\build\libyuv\liblibyuv.vcxproj", "{6AC9B65F-0862-4A5C-8A9D-141516993130}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyuv", "third_party\build\yuv\libyuv.vcxproj", "{6AC9B65F-0862-4A5C-8A9D-141516993130}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/pjproject-vs8.sln b/pjproject-vs8.sln
index 3c5dfd8d..f8acf6e9 100644
--- a/pjproject-vs8.sln
+++ b/pjproject-vs8.sln
@@ -100,7 +100,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpjproject", "pjsip-apps\build\libpjproject.vcproj", "{23D7679C-764C-4E02-8B29-BB882CEEEFE2}"

 	ProjectSection(ProjectDependencies) = postProject

 		{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}

-		{6AC9B65F-0862-4A5C-8A9D-141516993130} = {6AC9B65F-0862-4A5C-8A9D-141516993130}

+		{740DDEB9-D47C-4A83-A585-A366B6965410} = {740DDEB9-D47C-4A83-A585-A366B6965410}

 		{E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}

 		{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}

 		{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}

@@ -138,7 +138,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbaseclasses", "third_par
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua2_lib", "pjsip\build\pjsua2_lib.vcproj", "{B82CDD25-6903-430E-BD38-D8129A2015C1}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblibyuv", "third_party\build\libyuv\liblibyuv.vcproj", "{6AC9B65F-0862-4A5C-8A9D-141516993130}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyuv", "third_party\build\yuv\libyuv.vcproj", "{740DDEB9-D47C-4A83-A585-A366B6965410}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

@@ -3187,84 +3187,84 @@ Global
 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).Deploy.0 = Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)

 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|x64.ActiveCfg = Release-Static|x64

 		{B82CDD25-6903-430E-BD38-D8129A2015C1}.Release-Static|x64.Build.0 = Release-Static|x64

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Win32.Build.0 = Debug|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug|x64.ActiveCfg = Debug|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Pocket PC 2003 (ARMV4).Build.0 = Debug-Dynamic|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Pocket PC 2003 (ARMV4).Deploy.0 = Debug-Dynamic|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Smartphone 2003 (ARMV4).Build.0 = Debug-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Smartphone 2003 (ARMV4).Deploy.0 = Debug-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Static|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Pocket PC 2003 (ARMV4).Build.0 = Debug-Static|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Pocket PC 2003 (ARMV4).Deploy.0 = Debug-Static|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Static|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Smartphone 2003 (ARMV4).Build.0 = Debug-Static|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Smartphone 2003 (ARMV4).Deploy.0 = Debug-Static|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Win32.Build.0 = Debug-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Debug-Static|x64.ActiveCfg = Debug-Static|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.ActiveCfg = Release|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Win32.Build.0 = Release|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release|x64.ActiveCfg = Release|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Release-Dynamic|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Pocket PC 2003 (ARMV4).Build.0 = Release-Dynamic|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Pocket PC 2003 (ARMV4).Deploy.0 = Release-Dynamic|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Release-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Smartphone 2003 (ARMV4).Build.0 = Release-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Smartphone 2003 (ARMV4).Deploy.0 = Release-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Release-Static|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Pocket PC 2003 (ARMV4).Build.0 = Release-Static|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Pocket PC 2003 (ARMV4).Deploy.0 = Release-Static|Pocket PC 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Smartphone 2003 (ARMV4).ActiveCfg = Release-Static|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Smartphone 2003 (ARMV4).Build.0 = Release-Static|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Smartphone 2003 (ARMV4).Deploy.0 = Release-Static|Smartphone 2003 (ARMV4)

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.ActiveCfg = Release-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Win32.Build.0 = Release-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Static|Win32

-		{6AC9B65F-0862-4A5C-8A9D-141516993130}.Release-Static|x64.ActiveCfg = Release-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Pocket PC 2003 (ARMV4).Build.0 = Debug|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Pocket PC 2003 (ARMV4).Deploy.0 = Debug|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Smartphone 2003 (ARMV4).Build.0 = Debug|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Smartphone 2003 (ARMV4).Deploy.0 = Debug|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Win32.ActiveCfg = Debug|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Win32.Build.0 = Debug|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug|x64.ActiveCfg = Debug|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Pocket PC 2003 (ARMV4).Build.0 = Debug-Dynamic|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Pocket PC 2003 (ARMV4).Deploy.0 = Debug-Dynamic|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Smartphone 2003 (ARMV4).Build.0 = Debug-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Smartphone 2003 (ARMV4).Deploy.0 = Debug-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Static|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Pocket PC 2003 (ARMV4).Build.0 = Debug-Static|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Pocket PC 2003 (ARMV4).Deploy.0 = Debug-Static|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Smartphone 2003 (ARMV4).Build.0 = Debug-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Smartphone 2003 (ARMV4).Deploy.0 = Debug-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Win32.Build.0 = Debug-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Debug-Static|x64.ActiveCfg = Debug-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Pocket PC 2003 (ARMV4).Build.0 = Release|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Pocket PC 2003 (ARMV4).Deploy.0 = Release|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Smartphone 2003 (ARMV4).Build.0 = Release|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Smartphone 2003 (ARMV4).Deploy.0 = Release|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Win32.ActiveCfg = Release|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Win32.Build.0 = Release|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release|x64.ActiveCfg = Release|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Release-Dynamic|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Pocket PC 2003 (ARMV4).Build.0 = Release-Dynamic|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Pocket PC 2003 (ARMV4).Deploy.0 = Release-Dynamic|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Release-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Smartphone 2003 (ARMV4).Build.0 = Release-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Smartphone 2003 (ARMV4).Deploy.0 = Release-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Dynamic|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Release-Static|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Pocket PC 2003 (ARMV4).Build.0 = Release-Static|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Pocket PC 2003 (ARMV4).Deploy.0 = Release-Static|Pocket PC 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Smartphone 2003 (ARMV4).ActiveCfg = Release-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Smartphone 2003 (ARMV4).Build.0 = Release-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Smartphone 2003 (ARMV4).Deploy.0 = Release-Static|Smartphone 2003 (ARMV4)

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Win32.ActiveCfg = Release-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Win32.Build.0 = Release-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Static|Win32

+		{740DDEB9-D47C-4A83-A585-A366B6965410}.Release-Static|x64.ActiveCfg = Release-Static|Smartphone 2003 (ARMV4)

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/pjsip-apps/build/Samples-vc.mak b/pjsip-apps/build/Samples-vc.mak
index 48aa3fea..e20f63d9 100644
--- a/pjsip-apps/build/Samples-vc.mak
+++ b/pjsip-apps/build/Samples-vc.mak
@@ -42,11 +42,11 @@ SPEEX_LIB = ..\..\third_party\lib\libspeex-$(TARGET)$(LIBEXT)
 SRTP_LIB = ..\..\third_party\lib\libsrtp-$(TARGET)$(LIBEXT)
 G7221_LIB = ..\..\third_party\lib\libg7221codec-$(TARGET)$(LIBEXT)
 BASECLASSES_LIB = ..\..\third_party\lib\libbaseclasses-$(TARGET)$(LIBEXT)
-LIBYUV_LIB = ..\..\third_party\lib\liblibyuv-$(TARGET)$(LIBEXT)
+YUV_LIB = ..\..\third_party\lib\libyuv-$(TARGET)$(LIBEXT)
 
 THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(RESAMPLE_LIB) \
 		   $(SPEEX_LIB) $(SRTP_LIB) $(G7221_LIB) $(BASECLASSES_LIB) \
-		   $(LIBYUV_LIB)
+		   $(YUV_LIB)
 
 LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \
 	  $(PJSIP_LIB) $(PJMEDIA_CODEC_LIB) $(PJMEDIA_AUDIODEV_LIB) \
diff --git a/pjsip-apps/build/libpjproject.vcxproj b/pjsip-apps/build/libpjproject.vcxproj
index 85d1a86b..f66fa850 100644
--- a/pjsip-apps/build/libpjproject.vcxproj
+++ b/pjsip-apps/build/libpjproject.vcxproj
@@ -428,9 +428,6 @@
       <Project>{b5fe16f8-3edb-4110-bd80-b4238cc01e8d}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\third_party\build\libyuv\liblibyuv.vcxproj">
-      <Project>{6ac9b65f-0862-4a5c-8a9d-141516993130}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\third_party\build\milenage\libmilenage.vcxproj">
       <Project>{4bf51c21-5a30-423b-82fe-1ed410e5769d}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -447,6 +444,9 @@
       <Project>{f0dbaa03-1ba3-4e3b-a2ca-727e3d3ab858}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\third_party\build\yuv\libyuv.vcxproj">
+      <Project>{6ac9b65f-0862-4a5c-8a9d-141516993130}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/third_party/build/libyuv/Notes.txt b/third_party/build/yuv/Notes.txt
index 727badc9..52a8db97 100644
--- a/third_party/build/libyuv/Notes.txt
+++ b/third_party/build/yuv/Notes.txt
@@ -1,21 +1,21 @@
-Notes:

-* Source code for libyuv from https://chromium.googlesource.com/libyuv/libyuv/ dated 23 June 2016.

-* All code is compilable, except for compare_win.cc

-  - Use older version (https://chromium.googlesource.com/libyuv/libyuv/+/baf6a3c1bd385e7ffe6b7634560e71fb49e4f589%5E%21/)

-    Since there's a compiler error on:

-    --------------------------------------------------------------------------------------

-    pmulld      xmm0,xmm6

-    --------------------------------------------------------------------------------------

-

-  - On VS2015, error C2024: 'alignas' attribute applies to variables, data members and tag types only

-    --------------------------------------------------------------------------------------

-    __declspec(naked) __declspec(align(16))

-

-    Change to :

-

-    __declspec(naked)

-    --------------------------------------------------------------------------------------

-* Disable some compiler warning which apear alot:

-  - warning C4100: unreferenced formal parameter

-  - warning C4127: conditional expression is constant

+Notes:
+* Source code for libyuv from https://chromium.googlesource.com/libyuv/libyuv/ dated 23 June 2016.
+* All code is compilable, except for compare_win.cc
+  - Use older version (https://chromium.googlesource.com/libyuv/libyuv/+/baf6a3c1bd385e7ffe6b7634560e71fb49e4f589%5E%21/)
+    Since there's a compiler error on:
+    --------------------------------------------------------------------------------------
+    pmulld      xmm0,xmm6
+    --------------------------------------------------------------------------------------
+
+  - On VS2015, error C2024: 'alignas' attribute applies to variables, data members and tag types only
+    --------------------------------------------------------------------------------------
+    __declspec(naked) __declspec(align(16))
+
+    Change to :
+
+    __declspec(naked)
+    --------------------------------------------------------------------------------------
+* Disable some compiler warning which apear alot:
+  - warning C4100: unreferenced formal parameter
+  - warning C4127: conditional expression is constant
   - warning C4244: '=' : conversion from 'uint32' to 'uint8', possible loss of data
\ No newline at end of file
diff --git a/third_party/build/libyuv/liblibyuv.vcproj b/third_party/build/yuv/libyuv.vcproj
index bd71bf59..351db18d 100644
--- a/third_party/build/libyuv/liblibyuv.vcproj
+++ b/third_party/build/yuv/libyuv.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="liblibyuv"
-	ProjectGUID="{6AC9B65F-0862-4A5C-8A9D-141516993130}"
-	RootNamespace="liblibyuv"
+	Name="libyuv"
+	ProjectGUID="{740DDEB9-D47C-4A83-A585-A366B6965410}"
+	RootNamespace="libyuv"
 	>
 	<Platforms>
 		<Platform
@@ -61,7 +61,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -121,7 +121,7 @@
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -189,7 +189,7 @@
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -256,7 +256,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -315,7 +315,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -382,7 +382,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -449,7 +449,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -509,7 +509,7 @@
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -577,7 +577,7 @@
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -644,7 +644,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -703,7 +703,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -770,7 +770,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -837,7 +837,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -897,7 +897,7 @@
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -965,7 +965,7 @@
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1032,7 +1032,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1091,7 +1091,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1158,7 +1158,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1226,7 +1226,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 				DebugInformationFormat="3"
@@ -1287,7 +1287,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1347,7 +1347,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 				DebugInformationFormat="3"
@@ -1408,7 +1408,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1468,7 +1468,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 				DebugInformationFormat="3"
@@ -1529,7 +1529,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1589,7 +1589,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1657,7 +1657,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1725,7 +1725,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1793,7 +1793,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1860,7 +1860,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1927,7 +1927,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -1994,7 +1994,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2061,7 +2061,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2129,7 +2129,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2197,7 +2197,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2265,7 +2265,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2333,7 +2333,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2400,7 +2400,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2467,7 +2467,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2534,7 +2534,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2601,7 +2601,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2669,7 +2669,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2737,7 +2737,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2805,7 +2805,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2873,7 +2873,7 @@
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
 				Optimization="2"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -2940,7 +2940,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -3007,7 +3007,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -3074,7 +3074,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -3141,7 +3141,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4100 /wd4244 /wd4127"
 				ExecutionBucket="7"
-				AdditionalIncludeDirectories=".,../../libyuv/include,../../../pjlib/include"
+				AdditionalIncludeDirectories=".,../../yuv/include,../../../pjlib/include"
 				PreprocessorDefinitions="_LIB;_WINDOWS;HAVE_CONFIG_H;"
 				PrecompiledHeaderFile=""
 			/>
@@ -3192,115 +3192,115 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\libyuv\source\compare.cc"
+				RelativePath="..\..\yuv\source\compare.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\compare_common.cc"
+				RelativePath="..\..\yuv\source\compare_common.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\compare_win.cc"
+				RelativePath="..\..\yuv\source\compare_win.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\convert.cc"
+				RelativePath="..\..\yuv\source\convert.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\convert_argb.cc"
+				RelativePath="..\..\yuv\source\convert_argb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\convert_from.cc"
+				RelativePath="..\..\yuv\source\convert_from.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\convert_from_argb.cc"
+				RelativePath="..\..\yuv\source\convert_from_argb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\convert_jpeg.cc"
+				RelativePath="..\..\yuv\source\convert_jpeg.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\convert_to_argb.cc"
+				RelativePath="..\..\yuv\source\convert_to_argb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\convert_to_i420.cc"
+				RelativePath="..\..\yuv\source\convert_to_i420.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\cpu_id.cc"
+				RelativePath="..\..\yuv\source\cpu_id.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\mjpeg_decoder.cc"
+				RelativePath="..\..\yuv\source\mjpeg_decoder.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\mjpeg_validate.cc"
+				RelativePath="..\..\yuv\source\mjpeg_validate.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\planar_functions.cc"
+				RelativePath="..\..\yuv\source\planar_functions.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\rotate.cc"
+				RelativePath="..\..\yuv\source\rotate.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\rotate_any.cc"
+				RelativePath="..\..\yuv\source\rotate_any.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\rotate_argb.cc"
+				RelativePath="..\..\yuv\source\rotate_argb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\rotate_common.cc"
+				RelativePath="..\..\yuv\source\rotate_common.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\rotate_win.cc"
+				RelativePath="..\..\yuv\source\rotate_win.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\row_any.cc"
+				RelativePath="..\..\yuv\source\row_any.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\row_common.cc"
+				RelativePath="..\..\yuv\source\row_common.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\row_win.cc"
+				RelativePath="..\..\yuv\source\row_win.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\scale.cc"
+				RelativePath="..\..\yuv\source\scale.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\scale_any.cc"
+				RelativePath="..\..\yuv\source\scale_any.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\scale_argb.cc"
+				RelativePath="..\..\yuv\source\scale_argb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\scale_common.cc"
+				RelativePath="..\..\yuv\source\scale_common.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\scale_win.cc"
+				RelativePath="..\..\yuv\source\scale_win.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libyuv\source\video_common.cc"
+				RelativePath="..\..\yuv\source\video_common.cc"
 				>
 			</File>
 		</Filter>
diff --git a/third_party/build/libyuv/liblibyuv.vcxproj b/third_party/build/yuv/libyuv.vcxproj
index fc32c040..91b49dd4 100644
--- a/third_party/build/libyuv/liblibyuv.vcxproj
+++ b/third_party/build/yuv/libyuv.vcxproj
@@ -52,7 +52,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6AC9B65F-0862-4A5C-8A9D-141516993130}</ProjectGuid>
-    <RootNamespace>liblibyuv</RootNamespace>
+    <RootNamespace>libyuv</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'" Label="Configuration">
@@ -198,7 +198,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -209,7 +209,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -220,7 +220,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Static|Win32'">
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -231,7 +231,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Dynamic|Win32'">
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -242,7 +242,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Dynamic|Win32'">
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -253,7 +253,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Static|Win32'">
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -267,7 +267,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -282,7 +282,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -296,7 +296,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -311,7 +311,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -325,7 +325,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -340,7 +340,7 @@
     </Midl>
     <ClCompile>
       <AdditionalOptions>/wd4100 /wd4244 /wd4127 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;../../libyuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../yuv/include;../../../pjlib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;_WINDOWS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -349,39 +349,39 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\libyuv\source\compare.cc" />
-    <ClCompile Include="..\..\libyuv\source\compare_common.cc" />
-    <ClCompile Include="..\..\libyuv\source\compare_win.cc">
+    <ClCompile Include="..\..\yuv\source\compare.cc" />
+    <ClCompile Include="..\..\yuv\source\compare_common.cc" />
+    <ClCompile Include="..\..\yuv\source\compare_win.cc">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\..\libyuv\source\convert.cc" />
-    <ClCompile Include="..\..\libyuv\source\convert_argb.cc" />
-    <ClCompile Include="..\..\libyuv\source\convert_from.cc" />
-    <ClCompile Include="..\..\libyuv\source\convert_from_argb.cc" />
-    <ClCompile Include="..\..\libyuv\source\convert_jpeg.cc" />
-    <ClCompile Include="..\..\libyuv\source\convert_to_argb.cc" />
-    <ClCompile Include="..\..\libyuv\source\convert_to_i420.cc" />
-    <ClCompile Include="..\..\libyuv\source\cpu_id.cc" />
-    <ClCompile Include="..\..\libyuv\source\mjpeg_decoder.cc" />
-    <ClCompile Include="..\..\libyuv\source\mjpeg_validate.cc" />
-    <ClCompile Include="..\..\libyuv\source\planar_functions.cc" />
-    <ClCompile Include="..\..\libyuv\source\rotate.cc" />
-    <ClCompile Include="..\..\libyuv\source\rotate_any.cc" />
-    <ClCompile Include="..\..\libyuv\source\rotate_argb.cc" />
-    <ClCompile Include="..\..\libyuv\source\rotate_common.cc" />
-    <ClCompile Include="..\..\libyuv\source\rotate_win.cc" />
-    <ClCompile Include="..\..\libyuv\source\row_any.cc" />
-    <ClCompile Include="..\..\libyuv\source\row_common.cc" />
-    <ClCompile Include="..\..\libyuv\source\row_win.cc" />
-    <ClCompile Include="..\..\libyuv\source\scale.cc" />
-    <ClCompile Include="..\..\libyuv\source\scale_any.cc" />
-    <ClCompile Include="..\..\libyuv\source\scale_argb.cc" />
-    <ClCompile Include="..\..\libyuv\source\scale_common.cc" />
-    <ClCompile Include="..\..\libyuv\source\scale_win.cc" />
-    <ClCompile Include="..\..\libyuv\source\video_common.cc" />
+    <ClCompile Include="..\..\yuv\source\convert.cc" />
+    <ClCompile Include="..\..\yuv\source\convert_argb.cc" />
+    <ClCompile Include="..\..\yuv\source\convert_from.cc" />
+    <ClCompile Include="..\..\yuv\source\convert_from_argb.cc" />
+    <ClCompile Include="..\..\yuv\source\convert_jpeg.cc" />
+    <ClCompile Include="..\..\yuv\source\convert_to_argb.cc" />
+    <ClCompile Include="..\..\yuv\source\convert_to_i420.cc" />
+    <ClCompile Include="..\..\yuv\source\cpu_id.cc" />
+    <ClCompile Include="..\..\yuv\source\mjpeg_decoder.cc" />
+    <ClCompile Include="..\..\yuv\source\mjpeg_validate.cc" />
+    <ClCompile Include="..\..\yuv\source\planar_functions.cc" />
+    <ClCompile Include="..\..\yuv\source\rotate.cc" />
+    <ClCompile Include="..\..\yuv\source\rotate_any.cc" />
+    <ClCompile Include="..\..\yuv\source\rotate_argb.cc" />
+    <ClCompile Include="..\..\yuv\source\rotate_common.cc" />
+    <ClCompile Include="..\..\yuv\source\rotate_win.cc" />
+    <ClCompile Include="..\..\yuv\source\row_any.cc" />
+    <ClCompile Include="..\..\yuv\source\row_common.cc" />
+    <ClCompile Include="..\..\yuv\source\row_win.cc" />
+    <ClCompile Include="..\..\yuv\source\scale.cc" />
+    <ClCompile Include="..\..\yuv\source\scale_any.cc" />
+    <ClCompile Include="..\..\yuv\source\scale_argb.cc" />
+    <ClCompile Include="..\..\yuv\source\scale_common.cc" />
+    <ClCompile Include="..\..\yuv\source\scale_win.cc" />
+    <ClCompile Include="..\..\yuv\source\video_common.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libyuv\include\libyuv.h" />
+    <ClInclude Include="..\..\yuv\include\libyuv.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/third_party/build/libyuv/liblibyuv.vcxproj.filters b/third_party/build/yuv/libyuv.vcxproj.filters
index 1947758e..1947758e 100644
--- a/third_party/build/libyuv/liblibyuv.vcxproj.filters
+++ b/third_party/build/yuv/libyuv.vcxproj.filters
diff --git a/third_party/libyuv/AUTHORS b/third_party/yuv/AUTHORS
index 9686ac13..9686ac13 100644
--- a/third_party/libyuv/AUTHORS
+++ b/third_party/yuv/AUTHORS
diff --git a/third_party/libyuv/LICENSE b/third_party/yuv/LICENSE
index c911747a..c911747a 100644
--- a/third_party/libyuv/LICENSE
+++ b/third_party/yuv/LICENSE
diff --git a/third_party/libyuv/LICENSE_THIRD_PARTY b/third_party/yuv/LICENSE_THIRD_PARTY
index a71591e7..a71591e7 100644
--- a/third_party/libyuv/LICENSE_THIRD_PARTY
+++ b/third_party/yuv/LICENSE_THIRD_PARTY
diff --git a/third_party/libyuv/OWNERS b/third_party/yuv/OWNERS
index 2db52d30..2db52d30 100644
--- a/third_party/libyuv/OWNERS
+++ b/third_party/yuv/OWNERS
diff --git a/third_party/libyuv/PATENTS b/third_party/yuv/PATENTS
index 64aa5c90..64aa5c90 100644
--- a/third_party/libyuv/PATENTS
+++ b/third_party/yuv/PATENTS
diff --git a/third_party/libyuv/README.md b/third_party/yuv/README.md
index b59b71c5..b59b71c5 100644
--- a/third_party/libyuv/README.md
+++ b/third_party/yuv/README.md
diff --git a/third_party/libyuv/include/libyuv.h b/third_party/yuv/include/libyuv.h
index de652836..de652836 100644
--- a/third_party/libyuv/include/libyuv.h
+++ b/third_party/yuv/include/libyuv.h
diff --git a/third_party/libyuv/include/libyuv/basic_types.h b/third_party/yuv/include/libyuv/basic_types.h
index beb750ba..beb750ba 100644
--- a/third_party/libyuv/include/libyuv/basic_types.h
+++ b/third_party/yuv/include/libyuv/basic_types.h
diff --git a/third_party/libyuv/include/libyuv/compare.h b/third_party/yuv/include/libyuv/compare.h
index 08b2bb2e..08b2bb2e 100644
--- a/third_party/libyuv/include/libyuv/compare.h
+++ b/third_party/yuv/include/libyuv/compare.h
diff --git a/third_party/libyuv/include/libyuv/compare_row.h b/third_party/yuv/include/libyuv/compare_row.h
index 38a957b2..38a957b2 100644
--- a/third_party/libyuv/include/libyuv/compare_row.h
+++ b/third_party/yuv/include/libyuv/compare_row.h
diff --git a/third_party/libyuv/include/libyuv/convert.h b/third_party/yuv/include/libyuv/convert.h
index a2cdc571..a2cdc571 100644
--- a/third_party/libyuv/include/libyuv/convert.h
+++ b/third_party/yuv/include/libyuv/convert.h
diff --git a/third_party/libyuv/include/libyuv/convert_argb.h b/third_party/yuv/include/libyuv/convert_argb.h
index 079d273b..079d273b 100644
--- a/third_party/libyuv/include/libyuv/convert_argb.h
+++ b/third_party/yuv/include/libyuv/convert_argb.h
diff --git a/third_party/libyuv/include/libyuv/convert_from.h b/third_party/yuv/include/libyuv/convert_from.h
index 39e1578a..39e1578a 100644
--- a/third_party/libyuv/include/libyuv/convert_from.h
+++ b/third_party/yuv/include/libyuv/convert_from.h
diff --git a/third_party/libyuv/include/libyuv/convert_from_argb.h b/third_party/yuv/include/libyuv/convert_from_argb.h
index 1df53200..1df53200 100644
--- a/third_party/libyuv/include/libyuv/convert_from_argb.h
+++ b/third_party/yuv/include/libyuv/convert_from_argb.h
diff --git a/third_party/libyuv/include/libyuv/cpu_id.h b/third_party/yuv/include/libyuv/cpu_id.h
index dfb7445e..dfb7445e 100644
--- a/third_party/libyuv/include/libyuv/cpu_id.h
+++ b/third_party/yuv/include/libyuv/cpu_id.h
diff --git a/third_party/libyuv/include/libyuv/mjpeg_decoder.h b/third_party/yuv/include/libyuv/mjpeg_decoder.h
index 8423121d..8423121d 100644
--- a/third_party/libyuv/include/libyuv/mjpeg_decoder.h
+++ b/third_party/yuv/include/libyuv/mjpeg_decoder.h
diff --git a/third_party/libyuv/include/libyuv/planar_functions.h b/third_party/yuv/include/libyuv/planar_functions.h
index 881b0c5c..881b0c5c 100644
--- a/third_party/libyuv/include/libyuv/planar_functions.h
+++ b/third_party/yuv/include/libyuv/planar_functions.h
diff --git a/third_party/libyuv/include/libyuv/rotate.h b/third_party/yuv/include/libyuv/rotate.h
index 8af60b89..8af60b89 100644
--- a/third_party/libyuv/include/libyuv/rotate.h
+++ b/third_party/yuv/include/libyuv/rotate.h
diff --git a/third_party/libyuv/include/libyuv/rotate_argb.h b/third_party/yuv/include/libyuv/rotate_argb.h
index 660ff557..660ff557 100644
--- a/third_party/libyuv/include/libyuv/rotate_argb.h
+++ b/third_party/yuv/include/libyuv/rotate_argb.h
diff --git a/third_party/libyuv/include/libyuv/rotate_row.h b/third_party/yuv/include/libyuv/rotate_row.h
index ebc487f9..ebc487f9 100644
--- a/third_party/libyuv/include/libyuv/rotate_row.h
+++ b/third_party/yuv/include/libyuv/rotate_row.h
diff --git a/third_party/libyuv/include/libyuv/row.h b/third_party/yuv/include/libyuv/row.h
index 3028513e..3028513e 100644
--- a/third_party/libyuv/include/libyuv/row.h
+++ b/third_party/yuv/include/libyuv/row.h
diff --git a/third_party/libyuv/include/libyuv/scale.h b/third_party/yuv/include/libyuv/scale.h
index 102158d1..102158d1 100644
--- a/third_party/libyuv/include/libyuv/scale.h
+++ b/third_party/yuv/include/libyuv/scale.h
diff --git a/third_party/libyuv/include/libyuv/scale_argb.h b/third_party/yuv/include/libyuv/scale_argb.h
index b56cf520..b56cf520 100644
--- a/third_party/libyuv/include/libyuv/scale_argb.h
+++ b/third_party/yuv/include/libyuv/scale_argb.h
diff --git a/third_party/libyuv/include/libyuv/scale_row.h b/third_party/yuv/include/libyuv/scale_row.h
index 3064ddbd..3064ddbd 100644
--- a/third_party/libyuv/include/libyuv/scale_row.h
+++ b/third_party/yuv/include/libyuv/scale_row.h
diff --git a/third_party/libyuv/include/libyuv/version.h b/third_party/yuv/include/libyuv/version.h
index 80333218..80333218 100644
--- a/third_party/libyuv/include/libyuv/version.h
+++ b/third_party/yuv/include/libyuv/version.h
diff --git a/third_party/libyuv/include/libyuv/video_common.h b/third_party/yuv/include/libyuv/video_common.h
index ad934e42..ad934e42 100644
--- a/third_party/libyuv/include/libyuv/video_common.h
+++ b/third_party/yuv/include/libyuv/video_common.h
diff --git a/third_party/libyuv/source/compare.cc b/third_party/yuv/source/compare.cc
index e3846bdf..e3846bdf 100644
--- a/third_party/libyuv/source/compare.cc
+++ b/third_party/yuv/source/compare.cc
diff --git a/third_party/libyuv/source/compare_common.cc b/third_party/yuv/source/compare_common.cc
index 42fc5893..42fc5893 100644
--- a/third_party/libyuv/source/compare_common.cc
+++ b/third_party/yuv/source/compare_common.cc
diff --git a/third_party/libyuv/source/compare_gcc.cc b/third_party/yuv/source/compare_gcc.cc
index 1b83edb1..1b83edb1 100644
--- a/third_party/libyuv/source/compare_gcc.cc
+++ b/third_party/yuv/source/compare_gcc.cc
diff --git a/third_party/libyuv/source/compare_neon.cc b/third_party/yuv/source/compare_neon.cc
index 49aa3b4e..49aa3b4e 100644
--- a/third_party/libyuv/source/compare_neon.cc
+++ b/third_party/yuv/source/compare_neon.cc
diff --git a/third_party/libyuv/source/compare_neon64.cc b/third_party/yuv/source/compare_neon64.cc
index f9c7df98..f9c7df98 100644
--- a/third_party/libyuv/source/compare_neon64.cc
+++ b/third_party/yuv/source/compare_neon64.cc
diff --git a/third_party/libyuv/source/compare_win.cc b/third_party/yuv/source/compare_win.cc
index f4300a6f..f4300a6f 100644
--- a/third_party/libyuv/source/compare_win.cc
+++ b/third_party/yuv/source/compare_win.cc
diff --git a/third_party/libyuv/source/convert.cc b/third_party/yuv/source/convert.cc
index e332bc50..e332bc50 100644
--- a/third_party/libyuv/source/convert.cc
+++ b/third_party/yuv/source/convert.cc
diff --git a/third_party/libyuv/source/convert_argb.cc b/third_party/yuv/source/convert_argb.cc
index fb9582d6..fb9582d6 100644
--- a/third_party/libyuv/source/convert_argb.cc
+++ b/third_party/yuv/source/convert_argb.cc
diff --git a/third_party/libyuv/source/convert_from.cc b/third_party/yuv/source/convert_from.cc
index 46abdebc..46abdebc 100644
--- a/third_party/libyuv/source/convert_from.cc
+++ b/third_party/yuv/source/convert_from.cc
diff --git a/third_party/libyuv/source/convert_from_argb.cc b/third_party/yuv/source/convert_from_argb.cc
index 2a8682b7..2a8682b7 100644
--- a/third_party/libyuv/source/convert_from_argb.cc
+++ b/third_party/yuv/source/convert_from_argb.cc
diff --git a/third_party/libyuv/source/convert_jpeg.cc b/third_party/yuv/source/convert_jpeg.cc
index 90f550a2..90f550a2 100644
--- a/third_party/libyuv/source/convert_jpeg.cc
+++ b/third_party/yuv/source/convert_jpeg.cc
diff --git a/third_party/libyuv/source/convert_to_argb.cc b/third_party/yuv/source/convert_to_argb.cc
index aecdc80f..aecdc80f 100644
--- a/third_party/libyuv/source/convert_to_argb.cc
+++ b/third_party/yuv/source/convert_to_argb.cc
diff --git a/third_party/libyuv/source/convert_to_i420.cc b/third_party/yuv/source/convert_to_i420.cc
index e5f307c4..e5f307c4 100644
--- a/third_party/libyuv/source/convert_to_i420.cc
+++ b/third_party/yuv/source/convert_to_i420.cc
diff --git a/third_party/libyuv/source/cpu_id.cc b/third_party/yuv/source/cpu_id.cc
index 84927ebc..84927ebc 100644
--- a/third_party/libyuv/source/cpu_id.cc
+++ b/third_party/yuv/source/cpu_id.cc
diff --git a/third_party/libyuv/source/mjpeg_decoder.cc b/third_party/yuv/source/mjpeg_decoder.cc
index 50818418..50818418 100644
--- a/third_party/libyuv/source/mjpeg_decoder.cc
+++ b/third_party/yuv/source/mjpeg_decoder.cc
diff --git a/third_party/libyuv/source/mjpeg_validate.cc b/third_party/yuv/source/mjpeg_validate.cc
index 9c488320..9c488320 100644
--- a/third_party/libyuv/source/mjpeg_validate.cc
+++ b/third_party/yuv/source/mjpeg_validate.cc
diff --git a/third_party/libyuv/source/planar_functions.cc b/third_party/yuv/source/planar_functions.cc
index 237ab683..237ab683 100644
--- a/third_party/libyuv/source/planar_functions.cc
+++ b/third_party/yuv/source/planar_functions.cc
diff --git a/third_party/libyuv/source/rotate.cc b/third_party/yuv/source/rotate.cc
index 01ea5c40..01ea5c40 100644
--- a/third_party/libyuv/source/rotate.cc
+++ b/third_party/yuv/source/rotate.cc
diff --git a/third_party/libyuv/source/rotate_any.cc b/third_party/yuv/source/rotate_any.cc
index 31a74c31..31a74c31 100644
--- a/third_party/libyuv/source/rotate_any.cc
+++ b/third_party/yuv/source/rotate_any.cc
diff --git a/third_party/libyuv/source/rotate_argb.cc b/third_party/yuv/source/rotate_argb.cc
index 787c0ad1..787c0ad1 100644
--- a/third_party/libyuv/source/rotate_argb.cc
+++ b/third_party/yuv/source/rotate_argb.cc
diff --git a/third_party/libyuv/source/rotate_common.cc b/third_party/yuv/source/rotate_common.cc
index b33a9a0c..b33a9a0c 100644
--- a/third_party/libyuv/source/rotate_common.cc
+++ b/third_party/yuv/source/rotate_common.cc
diff --git a/third_party/libyuv/source/rotate_gcc.cc b/third_party/yuv/source/rotate_gcc.cc
index cbe870ca..cbe870ca 100644
--- a/third_party/libyuv/source/rotate_gcc.cc
+++ b/third_party/yuv/source/rotate_gcc.cc
diff --git a/third_party/libyuv/source/rotate_mips.cc b/third_party/yuv/source/rotate_mips.cc
index 1e8ce251..1e8ce251 100644
--- a/third_party/libyuv/source/rotate_mips.cc
+++ b/third_party/yuv/source/rotate_mips.cc
diff --git a/third_party/libyuv/source/rotate_neon.cc b/third_party/yuv/source/rotate_neon.cc
index 1c22b472..1c22b472 100644
--- a/third_party/libyuv/source/rotate_neon.cc
+++ b/third_party/yuv/source/rotate_neon.cc
diff --git a/third_party/libyuv/source/rotate_neon64.cc b/third_party/yuv/source/rotate_neon64.cc
index 1ab448f3..1ab448f3 100644
--- a/third_party/libyuv/source/rotate_neon64.cc
+++ b/third_party/yuv/source/rotate_neon64.cc
diff --git a/third_party/libyuv/source/rotate_win.cc b/third_party/yuv/source/rotate_win.cc
index 1300fc0f..1300fc0f 100644
--- a/third_party/libyuv/source/rotate_win.cc
+++ b/third_party/yuv/source/rotate_win.cc
diff --git a/third_party/libyuv/source/row_any.cc b/third_party/yuv/source/row_any.cc
index 494164fd..494164fd 100644
--- a/third_party/libyuv/source/row_any.cc
+++ b/third_party/yuv/source/row_any.cc
diff --git a/third_party/libyuv/source/row_common.cc b/third_party/yuv/source/row_common.cc
index 32d2f686..32d2f686 100644
--- a/third_party/libyuv/source/row_common.cc
+++ b/third_party/yuv/source/row_common.cc
diff --git a/third_party/libyuv/source/row_gcc.cc b/third_party/yuv/source/row_gcc.cc
index 1ac7ef1a..1ac7ef1a 100644
--- a/third_party/libyuv/source/row_gcc.cc
+++ b/third_party/yuv/source/row_gcc.cc
diff --git a/third_party/libyuv/source/row_mips.cc b/third_party/yuv/source/row_mips.cc
index 285f0b5a..285f0b5a 100644
--- a/third_party/libyuv/source/row_mips.cc
+++ b/third_party/yuv/source/row_mips.cc
diff --git a/third_party/libyuv/source/row_neon.cc b/third_party/yuv/source/row_neon.cc
index 909df060..909df060 100644
--- a/third_party/libyuv/source/row_neon.cc
+++ b/third_party/yuv/source/row_neon.cc
diff --git a/third_party/libyuv/source/row_neon64.cc b/third_party/yuv/source/row_neon64.cc
index 6375d4f5..6375d4f5 100644
--- a/third_party/libyuv/source/row_neon64.cc
+++ b/third_party/yuv/source/row_neon64.cc
diff --git a/third_party/libyuv/source/row_win.cc b/third_party/yuv/source/row_win.cc
index cdb76060..cdb76060 100644
--- a/third_party/libyuv/source/row_win.cc
+++ b/third_party/yuv/source/row_win.cc
diff --git a/third_party/libyuv/source/scale.cc b/third_party/yuv/source/scale.cc
index 36e3fe52..36e3fe52 100644
--- a/third_party/libyuv/source/scale.cc
+++ b/third_party/yuv/source/scale.cc
diff --git a/third_party/libyuv/source/scale_any.cc b/third_party/yuv/source/scale_any.cc
index ed76a9e4..ed76a9e4 100644
--- a/third_party/libyuv/source/scale_any.cc
+++ b/third_party/yuv/source/scale_any.cc
diff --git a/third_party/libyuv/source/scale_argb.cc b/third_party/yuv/source/scale_argb.cc
index 17f51ae9..17f51ae9 100644
--- a/third_party/libyuv/source/scale_argb.cc
+++ b/third_party/yuv/source/scale_argb.cc
diff --git a/third_party/libyuv/source/scale_common.cc b/third_party/yuv/source/scale_common.cc
index d3992df2..d3992df2 100644
--- a/third_party/libyuv/source/scale_common.cc
+++ b/third_party/yuv/source/scale_common.cc
diff --git a/third_party/libyuv/source/scale_gcc.cc b/third_party/yuv/source/scale_gcc.cc
index 400f2fde..400f2fde 100644
--- a/third_party/libyuv/source/scale_gcc.cc
+++ b/third_party/yuv/source/scale_gcc.cc
diff --git a/third_party/libyuv/source/scale_mips.cc b/third_party/yuv/source/scale_mips.cc
index ae953073..ae953073 100644
--- a/third_party/libyuv/source/scale_mips.cc
+++ b/third_party/yuv/source/scale_mips.cc
diff --git a/third_party/libyuv/source/scale_neon.cc b/third_party/yuv/source/scale_neon.cc
index 95f3362a..95f3362a 100644
--- a/third_party/libyuv/source/scale_neon.cc
+++ b/third_party/yuv/source/scale_neon.cc
diff --git a/third_party/libyuv/source/scale_neon64.cc b/third_party/yuv/source/scale_neon64.cc
index 3a62db5b..3a62db5b 100644
--- a/third_party/libyuv/source/scale_neon64.cc
+++ b/third_party/yuv/source/scale_neon64.cc
diff --git a/third_party/libyuv/source/scale_win.cc b/third_party/yuv/source/scale_win.cc
index 21b1ed92..21b1ed92 100644
--- a/third_party/libyuv/source/scale_win.cc
+++ b/third_party/yuv/source/scale_win.cc
diff --git a/third_party/libyuv/source/video_common.cc b/third_party/yuv/source/video_common.cc
index 00fb71e1..00fb71e1 100644
--- a/third_party/libyuv/source/video_common.cc
+++ b/third_party/yuv/source/video_common.cc