changeset 4362:20a889f18f23 libavformat

simplify
author aurel
date Mon, 02 Feb 2009 23:25:02 +0000
parents 3ae604db67e0
children 8142fb82cd75
files aiff.c
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/aiff.c	Mon Feb 02 23:09:39 2009 +0000
+++ b/aiff.c	Mon Feb 02 23:25:02 2009 +0000
@@ -81,13 +81,7 @@
 /* Metadata string read */
 static void get_meta(ByteIOContext *pb, char * str, int strsize, int size)
 {
-    int res;
-
-    if (size > strsize-1)
-        res = get_buffer(pb, (uint8_t*)str, strsize-1);
-    else
-        res = get_buffer(pb, (uint8_t*)str, size);
-
+    int res = get_buffer(pb, (uint8_t*)str, FFMIN(strsize-1, size));
     if (res < 0)
         return;