aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-11-12 20:49:53 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-11-12 20:49:53 +0100
commit9780c33eca3e03f146970e25196b8363e9ef4790 (patch)
treeaa1d7ea1e09bdfe13192e6fc2e0c9bc8010c8172
parentac0042f55f058a228a726f8e393884115f1daa99 (diff)
downloadffmpeg-9780c33eca3e03f146970e25196b8363e9ef4790.tar.gz
Increase Psygnosis YOP palette dynamics.
-rw-r--r--libavcodec/yop.c3
-rw-r--r--tests/ref/fate/yop14
2 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 597fe891ee..e5333db2fd 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -221,7 +221,8 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
palette[i + firstcolor] = (s->srcptr[0] << 18) |
(s->srcptr[1] << 10) |
(s->srcptr[2] << 2);
- palette[i + firstcolor] |= 0xFF << 24;
+ palette[i + firstcolor] |= 0xFF << 24 |
+ (palette[i + firstcolor] >> 6) & 0x30303;
}
s->frame.palette_has_changed = 1;
diff --git a/tests/ref/fate/yop b/tests/ref/fate/yop
index 782fd471c9..9010b99d78 100644
--- a/tests/ref/fate/yop
+++ b/tests/ref/fate/yop
@@ -1,7 +1,7 @@
-0, 0, 302760, 0x78939253
-0, 7500, 302760, 0x534f5253
-0, 15000, 302760, 0xe991aa82
-0, 22500, 302760, 0xc34b20bd
-0, 30000, 302760, 0x461d29a1
-0, 37500, 302760, 0x45abca02
-0, 45000, 302760, 0xb05448b9
+0, 0, 302760, 0xf24dfa37
+0, 7500, 302760, 0xcedcbb6c
+0, 15000, 302760, 0x8c2d19a2
+0, 22500, 302760, 0xe0fc92da
+0, 30000, 302760, 0xd7699bb4
+0, 37500, 302760, 0x26e93266
+0, 45000, 302760, 0x4cddb216