[FFmpeg-cvslog] sws: fix typo in xyz2rgb matrix use.

Michael Niedermayer git at videolan.org
Sun Apr 28 20:07:35 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 28 19:57:45 2013 +0200| [cb23b06e5e263663b20d6c1231ee1d86e6c54617] | committer: Michael Niedermayer

sws: fix typo in xyz2rgb matrix use.

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb23b06e5e263663b20d6c1231ee1d86e6c54617
---

 libswscale/swscale.c            |    2 +-
 tests/ref/fate/jpeg2000-dcinema |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 1581072..c34c56c 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -823,7 +823,7 @@ static void xyz12Torgb48(struct SwsContext *c, uint16_t *dst,
                 c->xyz2rgb_matrix[1][1] * y +
                 c->xyz2rgb_matrix[1][2] * z >> 12;
             b = c->xyz2rgb_matrix[2][0] * x +
-                c->xyz2rgb_matrix[1][2] * y +
+                c->xyz2rgb_matrix[2][1] * y +
                 c->xyz2rgb_matrix[2][2] * z >> 12;
 
             // limit values to 12-bit depth
diff --git a/tests/ref/fate/jpeg2000-dcinema b/tests/ref/fate/jpeg2000-dcinema
index dd44eed..d0ef917 100644
--- a/tests/ref/fate/jpeg2000-dcinema
+++ b/tests/ref/fate/jpeg2000-dcinema
@@ -1,3 +1,3 @@
 #tb 0: 1/24
-0,          0,          0,        1, 12441600, 0x05a68cf7
-0,          1,          1,        1, 12441600, 0x43788893
+0,          0,          0,        1, 12441600, 0x380d805a
+0,          1,          1,        1, 12441600, 0xfde5a60a



More information about the ffmpeg-cvslog mailing list