Commit 1651c4cd authored by michael's avatar michael

Remove redundant FFMIN().


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14918 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a1a12db6
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment