diff --git a/PanoPainter.xcodeproj/project.pbxproj b/PanoPainter.xcodeproj/project.pbxproj
index b9b9cef..551c0fd 100644
--- a/PanoPainter.xcodeproj/project.pbxproj
+++ b/PanoPainter.xcodeproj/project.pbxproj
@@ -177,6 +177,10 @@
 		ADA2A57922BE8D8E00C6B6C9 /* node_tool_bucket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA2A57622BE8D8E00C6B6C9 /* node_tool_bucket.cpp */; };
 		ADA3ABF6222C8C370083B825 /* node_panel_quick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA3ABF4222C8C350083B825 /* node_panel_quick.cpp */; };
 		ADA3ABF7222C8C370083B825 /* node_panel_quick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADA3ABF4222C8C350083B825 /* node_panel_quick.cpp */; };
+		ADA6C9F9236AFC5800116746 /* libmp4v2.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA6C9F8236AFC5700116746 /* libmp4v2.2.dylib */; };
+		ADA6C9FA236AFC6F00116746 /* libmp4v2.2.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = ADA6C9F8236AFC5700116746 /* libmp4v2.2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		ADA6C9FC236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */; };
+		ADA6C9FD236AFCC200116746 /* libopenh264-2.0.0-osx64.5.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		ADAECC932367922B00709FCC /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC912367922B00709FCC /* event.cpp */; };
 		ADAECC942367922B00709FCC /* event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC912367922B00709FCC /* event.cpp */; };
 		ADAECC952367922B00709FCC /* experiments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADAECC922367922B00709FCC /* experiments.cpp */; };
@@ -307,6 +311,18 @@
 			name = "Embed App Extensions";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		ADA6C9F7236AFBFF00116746 /* Embed Libraries */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				ADA6C9FA236AFC6F00116746 /* libmp4v2.2.dylib in Embed Libraries */,
+				ADA6C9FD236AFCC200116746 /* libopenh264-2.0.0-osx64.5.dylib in Embed Libraries */,
+			);
+			name = "Embed Libraries";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		ADFD32202166AA6000F46F85 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -499,6 +515,8 @@
 		ADA2A57722BE8D8E00C6B6C9 /* node_tool_bucket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_tool_bucket.h; sourceTree = "<group>"; };
 		ADA3ABF4222C8C350083B825 /* node_panel_quick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = node_panel_quick.cpp; sourceTree = "<group>"; };
 		ADA3ABF5222C8C370083B825 /* node_panel_quick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = node_panel_quick.h; sourceTree = "<group>"; };
+		ADA6C9F8236AFC5700116746 /* libmp4v2.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmp4v2.2.dylib; path = libs/mp4v2/lib/osx/libmp4v2.2.dylib; sourceTree = "<group>"; };
+		ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenh264-2.0.0-osx64.5.dylib"; path = "libs/openh264/lib/libopenh264-2.0.0-osx64.5.dylib"; sourceTree = "<group>"; };
 		ADAE4B2F216D075400B1DD8C /* HockeySDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = HockeySDKResources.bundle; path = "libs/hockeyapp/HockeySDK-iOS/HockeySDK.embeddedframework/HockeySDKResources.bundle"; sourceTree = "<group>"; };
 		ADAECC912367922B00709FCC /* event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = libs/yoga/yoga/event/event.cpp; sourceTree = SOURCE_ROOT; };
 		ADAECC922367922B00709FCC /* experiments.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = experiments.cpp; path = libs/yoga/yoga/internal/experiments.cpp; sourceTree = SOURCE_ROOT; };
@@ -594,11 +612,13 @@
 			buildActionMask = 2147483647;
 			files = (
 				AD3087C4205F0177009F9260 /* AVFoundation.framework in Frameworks */,
+				ADA6C9FC236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib in Frameworks */,
 				AD46901F22FF4328003DA1A6 /* AppCenter.framework in Frameworks */,
 				AD46901D22FF4328003DA1A6 /* AppCenterCrashes.framework in Frameworks */,
 				AD30D82F1F783E0100B6A112 /* libcurl.4.tbd in Frameworks */,
 				AD0E5CB11ECC726C00C35669 /* OpenGL.framework in Frameworks */,
 				AD46901E22FF4328003DA1A6 /* AppCenterAnalytics.framework in Frameworks */,
+				ADA6C9F9236AFC5800116746 /* libmp4v2.2.dylib in Frameworks */,
 				AD0E5CB01ECC726400C35669 /* Cocoa.framework in Frameworks */,
 				AD0E5CAF1ECC726000C35669 /* CoreFoundation.framework in Frameworks */,
 				ADF396DD216F749200024722 /* AppKit.framework in Frameworks */,
@@ -693,6 +713,8 @@
 		AD06989820CC6C3E0010825F /* OSX */ = {
 			isa = PBXGroup;
 			children = (
+				ADA6C9F8236AFC5700116746 /* libmp4v2.2.dylib */,
+				ADA6C9FB236AFCA700116746 /* libopenh264-2.0.0-osx64.5.dylib */,
 				AD46901C22FF4328003DA1A6 /* AppCenter.framework */,
 				AD46901B22FF4327003DA1A6 /* AppCenterAnalytics.framework */,
 				AD46901A22FF4327003DA1A6 /* AppCenterCrashes.framework */,
@@ -1122,6 +1144,7 @@
 				AD0E5C9A1ECC6F2B00C35669 /* Resources */,
 				AD2286BB214E96E60074567E /* Versioning Info.plist */,
 				ADFD32202166AA6000F46F85 /* CopyFiles */,
+				ADA6C9F7236AFBFF00116746 /* Embed Libraries */,
 			);
 			buildRules = (
 			);
@@ -1776,6 +1799,11 @@
 				);
 				INFOPLIST_FILE = "PanoPainter-OSX/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/libs/mp4v2/lib/osx",
+					"$(PROJECT_DIR)/libs/openh264/lib",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
@@ -1807,6 +1835,11 @@
 				);
 				INFOPLIST_FILE = "PanoPainter-OSX/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/libs/mp4v2/lib/osx",
+					"$(PROJECT_DIR)/libs/openh264/lib",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
diff --git a/libs/mp4v2 b/libs/mp4v2
index 268973a..31a8a1d 160000
--- a/libs/mp4v2
+++ b/libs/mp4v2
@@ -1 +1 @@
-Subproject commit 268973a63100a21c3a3badaef73498e52f73ee4e
+Subproject commit 31a8a1d66ac5b961cb5b7cf50bfabfb133e22545