Mercurial > libavcodec.hg
comparison truemotion1.c @ 6750:c93570aeb3eb libavcodec
Remove unnecessary parentheses from return calls.
| author | diego |
|---|---|
| date | Tue, 06 May 2008 09:16:36 +0000 |
| parents | 5df0c730234d |
| children | 48cfbc65d688 |
comparison
equal
deleted
inserted
replaced
| 6749:b1778cf7f3b1 | 6750:c93570aeb3eb |
|---|---|
| 174 | 174 |
| 175 lo = ydt[p1]; | 175 lo = ydt[p1]; |
| 176 lo += (lo << 5) + (lo << 10); | 176 lo += (lo << 5) + (lo << 10); |
| 177 hi = ydt[p2]; | 177 hi = ydt[p2]; |
| 178 hi += (hi << 5) + (hi << 10); | 178 hi += (hi << 5) + (hi << 10); |
| 179 return ((lo + (hi << 16)) << 1); | 179 return (lo + (hi << 16)) << 1; |
| 180 } | 180 } |
| 181 | 181 |
| 182 #ifdef WORDS_BIGENDIAN | 182 #ifdef WORDS_BIGENDIAN |
| 183 static int make_cdt15_entry(int p2, int p1, int16_t *cdt) | 183 static int make_cdt15_entry(int p2, int p1, int16_t *cdt) |
| 184 #else | 184 #else |
| 188 int r, b, lo; | 188 int r, b, lo; |
| 189 | 189 |
| 190 b = cdt[p2]; | 190 b = cdt[p2]; |
| 191 r = cdt[p1] << 10; | 191 r = cdt[p1] << 10; |
| 192 lo = b + r; | 192 lo = b + r; |
| 193 return ((lo + (lo << 16)) << 1); | 193 return (lo + (lo << 16)) << 1; |
| 194 } | 194 } |
| 195 | 195 |
| 196 #ifdef WORDS_BIGENDIAN | 196 #ifdef WORDS_BIGENDIAN |
| 197 static int make_ydt16_entry(int p2, int p1, int16_t *ydt) | 197 static int make_ydt16_entry(int p2, int p1, int16_t *ydt) |
| 198 #else | 198 #else |
| 203 | 203 |
| 204 lo = ydt[p1]; | 204 lo = ydt[p1]; |
| 205 lo += (lo << 6) + (lo << 11); | 205 lo += (lo << 6) + (lo << 11); |
| 206 hi = ydt[p2]; | 206 hi = ydt[p2]; |
| 207 hi += (hi << 6) + (hi << 11); | 207 hi += (hi << 6) + (hi << 11); |
| 208 return ((lo + (hi << 16)) << 1); | 208 return (lo + (hi << 16)) << 1; |
| 209 } | 209 } |
| 210 | 210 |
| 211 #ifdef WORDS_BIGENDIAN | 211 #ifdef WORDS_BIGENDIAN |
| 212 static int make_cdt16_entry(int p2, int p1, int16_t *cdt) | 212 static int make_cdt16_entry(int p2, int p1, int16_t *cdt) |
| 213 #else | 213 #else |
| 217 int r, b, lo; | 217 int r, b, lo; |
| 218 | 218 |
| 219 b = cdt[p2]; | 219 b = cdt[p2]; |
| 220 r = cdt[p1] << 11; | 220 r = cdt[p1] << 11; |
| 221 lo = b + r; | 221 lo = b + r; |
| 222 return ((lo + (lo << 16)) << 1); | 222 return (lo + (lo << 16)) << 1; |
| 223 } | 223 } |
| 224 | 224 |
| 225 #ifdef WORDS_BIGENDIAN | 225 #ifdef WORDS_BIGENDIAN |
| 226 static int make_ydt24_entry(int p2, int p1, int16_t *ydt) | 226 static int make_ydt24_entry(int p2, int p1, int16_t *ydt) |
| 227 #else | 227 #else |
| 230 { | 230 { |
| 231 int lo, hi; | 231 int lo, hi; |
| 232 | 232 |
| 233 lo = ydt[p1]; | 233 lo = ydt[p1]; |
| 234 hi = ydt[p2]; | 234 hi = ydt[p2]; |
| 235 return ((lo + (hi << 8) + (hi << 16)) << 1); | 235 return (lo + (hi << 8) + (hi << 16)) << 1; |
| 236 } | 236 } |
| 237 | 237 |
| 238 #ifdef WORDS_BIGENDIAN | 238 #ifdef WORDS_BIGENDIAN |
| 239 static int make_cdt24_entry(int p2, int p1, int16_t *cdt) | 239 static int make_cdt24_entry(int p2, int p1, int16_t *cdt) |
| 240 #else | 240 #else |
| 243 { | 243 { |
| 244 int r, b; | 244 int r, b; |
| 245 | 245 |
| 246 b = cdt[p2]; | 246 b = cdt[p2]; |
| 247 r = cdt[p1]<<16; | 247 r = cdt[p1]<<16; |
| 248 return ((b+r) << 1); | 248 return (b+r) << 1; |
| 249 } | 249 } |
| 250 | 250 |
| 251 static void gen_vector_table15(TrueMotion1Context *s, const uint8_t *sel_vector_table) | 251 static void gen_vector_table15(TrueMotion1Context *s, const uint8_t *sel_vector_table) |
| 252 { | 252 { |
| 253 int len, i, j; | 253 int len, i, j; |