Mercurial > mplayer.hg
comparison liba52/bitstream.h @ 29264:e83eef58b30a
Remove all kind of trailing whitespaces from all MPlayer's files.
This affects all kind of spaces (' ',^I,^M,^L,...): actually
[:space:] regex character set.
author | bircoph |
---|---|
date | Wed, 13 May 2009 15:22:13 +0000 |
parents | 4e0196e827db |
children | f01023c524c3 |
comparison
equal
deleted
inserted
replaced
29263:0f1b5b68af32 | 29264:e83eef58b30a |
---|---|
102 uint32_t result= swab32( unaligned32(((uint8_t *)state->buffer_start)+(indx>>3)) ); | 102 uint32_t result= swab32( unaligned32(((uint8_t *)state->buffer_start)+(indx>>3)) ); |
103 | 103 |
104 result<<= (indx&0x07); | 104 result<<= (indx&0x07); |
105 result>>= 32 - num_bits; | 105 result>>= 32 - num_bits; |
106 indx+= num_bits; | 106 indx+= num_bits; |
107 | 107 |
108 return result; | 108 return result; |
109 #else | 109 #else |
110 uint32_t result; | 110 uint32_t result; |
111 | 111 |
112 if (num_bits < state->bits_left) { | 112 if (num_bits < state->bits_left) { |
113 result = (state->current_word << (32 - state->bits_left)) >> (32 - num_bits); | 113 result = (state->current_word << (32 - state->bits_left)) >> (32 - num_bits); |
114 state->bits_left -= num_bits; | 114 state->bits_left -= num_bits; |
115 return result; | 115 return result; |
116 } | 116 } |
134 int32_t result= swab32( unaligned32(((uint8_t *)state->buffer_start)+(indx>>3)) ); | 134 int32_t result= swab32( unaligned32(((uint8_t *)state->buffer_start)+(indx>>3)) ); |
135 | 135 |
136 result<<= (indx&0x07); | 136 result<<= (indx&0x07); |
137 result>>= 32 - num_bits; | 137 result>>= 32 - num_bits; |
138 indx+= num_bits; | 138 indx+= num_bits; |
139 | 139 |
140 return result; | 140 return result; |
141 #else | 141 #else |
142 int32_t result; | 142 int32_t result; |
143 | 143 |
144 if (num_bits < state->bits_left) { | 144 if (num_bits < state->bits_left) { |
145 result = (((int32_t)state->current_word) << (32 - state->bits_left)) >> (32 - num_bits); | 145 result = (((int32_t)state->current_word) << (32 - state->bits_left)) >> (32 - num_bits); |
146 state->bits_left -= num_bits; | 146 state->bits_left -= num_bits; |
147 return result; | 147 return result; |
148 } | 148 } |