Mercurial > libavcodec.hg

changeset 10193:ee31a41c5062 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify color_flags calculation, remove a pointless initialization and use AV_RB16 where possible.
author reimar
date Sat, 19 Sep 2009 11:36:51 +0000
parents 272cac6de8ce
children 5b05416fcb6b
files smc.c
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/smc.c	Sat Sep 19 11:35:55 2009 +0000
+++ b/smc.c	Sat Sep 19 11:36:51 2009 +0000
@@ -366,16 +366,11 @@
                     flags_a = xx012456, flags_b = xx89A37B
                 */
                 /* build the color flags */
-                color_flags_a = color_flags_b = 0;
                 color_flags_a =
-                    (s->buf[stream_ptr + 0] << 16) |
-                    ((s->buf[stream_ptr + 1] & 0xF0) << 8) |
-                    ((s->buf[stream_ptr + 2] & 0xF0) << 4) |
-                    ((s->buf[stream_ptr + 2] & 0x0F) << 4) |
-                    ((s->buf[stream_ptr + 3] & 0xF0) >> 4);
+                    ((AV_RB16(s->buf + stream_ptr    ) & 0xFFF0) << 8) |
+                     (AV_RB16(s->buf + stream_ptr + 2) >> 4);
                 color_flags_b =
-                    (s->buf[stream_ptr + 4] << 16) |
-                    ((s->buf[stream_ptr + 5] & 0xF0) << 8) |
+                    ((AV_RB16(s->buf + stream_ptr + 4) & 0xFFF0) << 8) |
                     ((s->buf[stream_ptr + 1] & 0x0F) << 8) |
                     ((s->buf[stream_ptr + 3] & 0x0F) << 4) |
                     (s->buf[stream_ptr + 5] & 0x0F);