RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify color_flags calculation, remove a pointless initialization 

and use AV_RB16 where possible.

Originally committed as revision 19925 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-09-19 11:36:51 +00:00
parent 75fe5b5243
commit bdb156c7b1
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/smc.c
View File

@ -366,16 +366,11 @@ static void smc_decode_stream(SmcContext *s)
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);