diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 19:57:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 19:57:45 +0200 |
| commit | cb23b06e5e263663b20d6c1231ee1d86e6c54617 (patch) | |
| tree | b93d073573918f1065b44f1bfc8a371018b07f55 | |
| parent | 54429142c59656e6e143319ffc390a03de3e9f93 (diff) | |
| download | ffmpeg-cb23b06e5e263663b20d6c1231ee1d86e6c54617.tar.gz | |
sws: fix typo in xyz2rgb matrix use.
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/swscale.c | 2 | ||||
| -rw-r--r-- | tests/ref/fate/jpeg2000-dcinema | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 15810728a1..c34c56ca62 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 dd44eedffa..d0ef9178f7 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 |