# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1580801875 -3600
# Node ID 5faf76511931b7de39f4f22772d0f406711ca787
# Parent  e168a2dedb00585917cd566e6a2d79c4921f79fe# Parent  8aab20dde416d60ee94b97991cd91b2165cf3792
integration mainline->storage-commitment

diff -r e168a2dedb00 -r 5faf76511931 Core/DicomNetworking/Internals/CommandDispatcher.cpp
--- a/Core/DicomNetworking/Internals/CommandDispatcher.cpp	Tue Feb 04 08:22:22 2020 +0100
+++ b/Core/DicomNetworking/Internals/CommandDispatcher.cpp	Tue Feb 04 08:37:55 2020 +0100
@@ -477,6 +477,17 @@
           storageTransferSyntaxes.push_back(UID_MPEG2MainProfileAtHighLevelTransferSyntax);
         }
 
+        // New in Orthanc 1.6.0
+        if (!server.HasApplicationEntityFilter() ||
+            server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Mpeg4))
+        {
+          storageTransferSyntaxes.push_back(UID_MPEG4BDcompatibleHighProfileLevel4_1TransferSyntax);
+          storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_1TransferSyntax);
+          storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For2DVideoTransferSyntax);
+          storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For3DVideoTransferSyntax);
+          storageTransferSyntaxes.push_back(UID_MPEG4StereoHighProfileLevel4_2TransferSyntax);
+        }
+
         if (!server.HasApplicationEntityFilter() ||
             server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Rle))
         {
diff -r e168a2dedb00 -r 5faf76511931 NEWS
--- a/NEWS	Tue Feb 04 08:22:22 2020 +0100
+++ b/NEWS	Tue Feb 04 08:37:55 2020 +0100
@@ -1,11 +1,6 @@
 Pending changes in the mainline
 ===============================
 
-Plugins
--------
-
-* New sample plugin: "ConnectivityChecks"
-
 REST API
 --------
 
@@ -13,15 +8,22 @@
 * added "/peers/{id}/system" route to test the connectivity with a remote peer (and eventually
   retrieve its version number)
 * "/changes": Allow the "limit" argument to be greater than 100
+* /instances/{id}/preview route now takes the windowing into account
+
+Plugins
+-------
+
+* New sample plugin: "ConnectivityChecks"
 
 Maintenance
 -----------
 
+* Support of MPEG4 transfer syntaxes in C-Store SCP
 * C-Find SCU at Instance level now sets the 0008,0052 tag to IMAGE per default (was INSTANCE).
   Therefore, the "ClearCanvas" and "Dcm4Chee" modality manufacturer have now been deprecated.
 * Fix issue #156 (Chunked Dicom-web transfer uses 100% CPU)
 * Fix issue #165 (Boundary parameter in multipart Content-Type is too long)
-* /instances/{id}/preview route now takes the windowing into account
+
 
 Version 1.5.8 (2019-10-16)
 ==========================