summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-08-23 13:35:12 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-08-23 13:35:12 +0000
commit56523713e518e690c338b624542c0fd635cdbb98 (patch)
tree262120b9cade1329a8fe03078e6d4dc4c4531fb6
parent4df7beb3686caf2df345d2e10564aa8cf6c24a65 (diff)
Remove redundant FFMIN().
Originally committed as revision 14918 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/dca.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 83b448858d..f7631d4fa8 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1116,12 +1116,12 @@ static int dca_convert_bitstream(const uint8_t * src, int src_size, uint8_t * ds
mrk = AV_RB32(src);
switch (mrk) {
case DCA_MARKER_RAW_BE:
- memcpy(dst, src, FFMIN(src_size, max_size));
- return FFMIN(src_size, max_size);
+ memcpy(dst, src, src_size);
+ return src_size;
case DCA_MARKER_RAW_LE:
- for (i = 0; i < (FFMIN(src_size, max_size) + 1) >> 1; i++)
+ for (i = 0; i < (src_size + 1) >> 1; i++)
*sdst++ = bswap_16(*ssrc++);
- return FFMIN(src_size, max_size);
+ return src_size;
case DCA_MARKER_14B_BE:
case DCA_MARKER_14B_LE:
init_put_bits(&pb, dst, max_size);