Mercurial > libavcodec.hg

changeset 7671:1bdb37f93bd2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove redundant FFMIN().
author michael
date Sat, 23 Aug 2008 13:35:12 +0000
parents dabe2516abe2
children 1c01b74dc78c
files dca.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/dca.c	Sat Aug 23 13:29:13 2008 +0000
+++ b/dca.c	Sat Aug 23 13:35:12 2008 +0000
@@ -1116,12 +1116,12 @@
     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);