[FFmpeg-cvslog] r19925 - trunk/libavcodec/smc.c

[reimar]

Author: reimar
Date: Sat Sep 19 13:36:51 2009
New Revision: 19925

Log:
Simplify color_flags calculation, remove a pointless initialization
and use AV_RB16 where possible.

Modified:
   trunk/libavcodec/smc.c

Modified: trunk/libavcodec/smc.c
==============================================================================
--- trunk/libavcodec/smc.c	Sat Sep 19 13:35:55 2009	(r19924)
+++ trunk/libavcodec/smc.c	Sat Sep 19 13:36:51 2009	(r19925)
@@ -366,16 +366,11 @@ static void smc_decode_stream(SmcContext
                     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);