har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant FFMIN().

Browse Source 
Originally committed as revision 14918 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-08-23 13:35:12 +00:00
parent 4df7beb368
commit 56523713e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dca.c
View File

@ -1116,12 +1116,12 @@ static int dca_convert_bitstream(const uint8_t * src, int src_size, uint8_t * ds
mrk = AV_RB32(src); mrk = AV_RB32(src);
switch (mrk) { switch (mrk) {
case DCA_MARKER_RAW_BE: case DCA_MARKER_RAW_BE:
memcpy(dst, src, FFMIN(src_size, max_size)); memcpy(dst, src, src_size);
return FFMIN(src_size, max_size); return src_size;
case DCA_MARKER_RAW_LE: 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++); *sdst++ = bswap_16(*ssrc++);
return FFMIN(src_size, max_size); return src_size;
case DCA_MARKER_14B_BE: case DCA_MARKER_14B_BE:
case DCA_MARKER_14B_LE: case DCA_MARKER_14B_LE:
init_put_bits(&pb, dst, max_size); init_put_bits(&pb, dst, max_size);