Mercurial > libavcodec.hg
comparison dca.c @ 7671:1bdb37f93bd2 libavcodec
Remove redundant FFMIN().
| author | michael |
|---|---|
| date | Sat, 23 Aug 2008 13:35:12 +0000 |
| parents | dabe2516abe2 |
| children | eb4802bc73f0 |
comparison
equal
deleted
inserted
replaced
| 7670:dabe2516abe2 | 7671:1bdb37f93bd2 |
|---|---|
| 1114 } | 1114 } |
| 1115 | 1115 |
| 1116 mrk = AV_RB32(src); | 1116 mrk = AV_RB32(src); |
| 1117 switch (mrk) { | 1117 switch (mrk) { |
| 1118 case DCA_MARKER_RAW_BE: | 1118 case DCA_MARKER_RAW_BE: |
| 1119 memcpy(dst, src, FFMIN(src_size, max_size)); | 1119 memcpy(dst, src, src_size); |
| 1120 return FFMIN(src_size, max_size); | 1120 return src_size; |
| 1121 case DCA_MARKER_RAW_LE: | 1121 case DCA_MARKER_RAW_LE: |
| 1122 for (i = 0; i < (FFMIN(src_size, max_size) + 1) >> 1; i++) | 1122 for (i = 0; i < (src_size + 1) >> 1; i++) |
| 1123 *sdst++ = bswap_16(*ssrc++); | 1123 *sdst++ = bswap_16(*ssrc++); |
| 1124 return FFMIN(src_size, max_size); | 1124 return src_size; |
| 1125 case DCA_MARKER_14B_BE: | 1125 case DCA_MARKER_14B_BE: |
| 1126 case DCA_MARKER_14B_LE: | 1126 case DCA_MARKER_14B_LE: |
| 1127 init_put_bits(&pb, dst, max_size); | 1127 init_put_bits(&pb, dst, max_size); |
| 1128 for (i = 0; i < (src_size + 1) >> 1; i++, src += 2) { | 1128 for (i = 0; i < (src_size + 1) >> 1; i++, src += 2) { |
| 1129 tmp = ((mrk == DCA_MARKER_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF; | 1129 tmp = ((mrk == DCA_MARKER_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF; |