diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61f60a379..232e6f4c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@ Group changes to describe their impact on the project, as follows:
 
 ## [Unreleased]
 
+### Added
+- Support of H265 video format based on Apple's VideoToolbox framework.
+
 ### Fixed
 - Fix Bluetooth management
 
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 8c2d47f32..aba760c2d 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -136,6 +136,7 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre
 												   {"g729", 8000, "g729_preference"},
 												   {"mp4v-es", 90000, "mp4v-es_preference"},
 												   {"h264", 90000, "h264_preference"},
+												   {"h265", 90000, "h265_preference"},
 												   {"vp8", 90000, "vp8_preference"},
 												   {"mpeg4-generic", 16000, "aaceld_16k_preference"},
 												   {"mpeg4-generic", 22050, "aaceld_22k_preference"},
diff --git a/Settings/InAppSettings.bundle/Video.plist b/Settings/InAppSettings.bundle/Video.plist
index 439ee4ad8..8e6dca3eb 100644
--- a/Settings/InAppSettings.bundle/Video.plist
+++ b/Settings/InAppSettings.bundle/Video.plist
@@ -158,6 +158,16 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>h265_preference</string>
+			<key>Title</key>
+			<string>H.265</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
 		<dict>
 			<key>DefaultValue</key>
 			<false/>
diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2
index 1d6722bbb..70cf3765c 160000
--- a/submodules/mediastreamer2
+++ b/submodules/mediastreamer2
@@ -1 +1 @@
-Subproject commit 1d6722bbb6b7d5609c148ab782869bb49b21f26b
+Subproject commit 70cf3765c463a40d3616c817398c52af4ebce758
diff --git a/submodules/msopenh264 b/submodules/msopenh264
index 18b41c256..fd330d26e 160000
--- a/submodules/msopenh264
+++ b/submodules/msopenh264
@@ -1 +1 @@
-Subproject commit 18b41c2569ea76b8eb1df9f85a32f16b3d001cc0
+Subproject commit fd330d26ecd368f6ee71e81c4f72ca6b935b8b33
diff --git a/submodules/msx264 b/submodules/msx264
index 662bc4bae..f4fe74056 160000
--- a/submodules/msx264
+++ b/submodules/msx264
@@ -1 +1 @@
-Subproject commit 662bc4baef6bdda578d7b28fef7572cae9f255d6
+Subproject commit f4fe74056d0474b42025d95449ec859e984d78ea