summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-10-23 22:28:57 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-10-23 22:28:57 +0000
commit3d2308b0af23cf420650aae86e15d72466d9c9c6 (patch)
tree52a10db8d2f8fba361ce5435bd357be656e750e1
parent478638abad7df6e65f1afeaf4b0cd2bc4e545865 (diff)
use FFMIN
Originally committed as revision 10848 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mov.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0ce63209dd..0972f7316d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -181,8 +181,7 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
a.size -= 8;
if(a.size < 0)
break;
- if (a.size > atom.size - total_size)
- a.size = atom.size - total_size;
+ a.size = FFMIN(a.size, atom.size - total_size);
for (i = 0; c->parse_table[i].type != 0L
&& c->parse_table[i].type != a.type; i++)