update ffmpeg, MediaInfoLib to r3518, lcms

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2755 10f7b99b-c216-0410-bff0-8a66a9350fd8

3 files changed, 17 insertions, 13 deletions

diff --git a/src/thirdparty/lcms2/AUTHORS b/src/thirdparty/lcms2/AUTHORS
index 3a4e7410d..48424a131 100644
--- a/src/thirdparty/lcms2/AUTHORS
+++ b/src/thirdparty/lcms2/AUTHORS
@@ -3,24 +3,24 @@
 

 Main Author

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

-Marti Maria

+Marti Maria 

 

 

-Contributors

+Contributors 

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

-Bob Friesenhahn

+Bob Friesenhahn 

 Kai-Uwe Behrmann

 Stuart Nixon

 Jordi Vilar

 Richard Hughes

 Auke Nauta

 Chris Evans

-Lorenzo Ridolfi

+Lorenzo Ridolfi 

 

 

-Special Thanks

+Special Thanks 

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

 Jan Morovic

 Jos Vernon (WebSupergoo)

 Harald Schneider (Maxon)

-Christian Albrecht

+Christian Albrecht 

diff --git a/src/thirdparty/lcms2/ChangeLog b/src/thirdparty/lcms2/ChangeLog
index b9c1a694d..c8bff3ec5 100644
--- a/src/thirdparty/lcms2/ChangeLog
+++ b/src/thirdparty/lcms2/ChangeLog
@@ -21,6 +21,10 @@ Fixed several integer overflow and other integrity checks, thanks to Chris Evans
 linkicc now stores the rendering intent in the profile header

 Fixed delphi interface

 Added Duotone support (Bilinear interpolation)

+Fixed a bug on curve reversing when source curves have few points

+Added bound check in floating point interpolation

 

 2.1 Maintenance release

------------------------
\ No newline at end of file
+-----------------------

+

+Fixed a bug in absolute colorimetric intent
\ No newline at end of file
diff --git a/src/thirdparty/lcms2/src/cmscnvrt.c b/src/thirdparty/lcms2/src/cmscnvrt.c
index 80958a9d0..cdd69cbbd 100644
--- a/src/thirdparty/lcms2/src/cmscnvrt.c
+++ b/src/thirdparty/lcms2/src/cmscnvrt.c
@@ -230,23 +230,23 @@ cmsBool  ComputeAbsoluteIntent(cmsFloat64Number AdaptationState,
         _cmsVEC3init(&Scale.v[1], 0,  WhitePointIn->Y / WhitePointOut->Y, 0);

         _cmsVEC3init(&Scale.v[2], 0, 0,  WhitePointIn->Z / WhitePointOut->Z);

 

-        m1 = *ChromaticAdaptationMatrixIn;

+        m1 = *ChromaticAdaptationMatrixOut;

         if (!_cmsMAT3inverse(&m1, &m2)) return FALSE; 

         _cmsMAT3per(&m3, &m2, &Scale);

 

-        // m3 holds CHAD from input white to D50 times abs. col. scaling

+        // m3 holds CHAD from output white to D50 times abs. col. scaling

         if (AdaptationState == 0.0) {

 

             // Observer is not adapted, undo the chromatic adaptation

-            _cmsMAT3per(m, &m3, ChromaticAdaptationMatrixOut);

+            _cmsMAT3per(m, &m3, ChromaticAdaptationMatrixIn);

 

         } else {

 

             cmsMAT3 MixedCHAD;

             cmsFloat64Number TempSrc, TempDest, Temp;

 

-            TempSrc  = CHAD2Temp(ChromaticAdaptationMatrixIn);  // K for source white

-            TempDest = CHAD2Temp(ChromaticAdaptationMatrixOut); // K for dest white

+            TempSrc  = CHAD2Temp(ChromaticAdaptationMatrixIn);  

+            TempDest = CHAD2Temp(ChromaticAdaptationMatrixOut); 

 

             if (TempSrc < 0.0 || TempDest < 0.0) return FALSE; // Something went wrong

 

@@ -256,7 +256,7 @@ cmsBool  ComputeAbsoluteIntent(cmsFloat64Number AdaptationState,
                 return TRUE;

             }

 

-            Temp = AdaptationState * TempSrc + (1.0 - AdaptationState) * TempDest;

+            Temp = AdaptationState * TempDest + (1.0 - AdaptationState) * TempSrc;

 

             // Get a CHAD from D50 to whatever output temperature. This replaces output CHAD

             Temp2CHAD(&MixedCHAD, Temp);