[FFmpeg-cvslog] r16964 - trunk/libavformat/aiff.c

[aurel]

Author: aurel
Date: Tue Feb  3 00:25:02 2009
New Revision: 16964

Log:
simplify

Modified:
   trunk/libavformat/aiff.c

Modified: trunk/libavformat/aiff.c
==============================================================================
--- trunk/libavformat/aiff.c	Tue Feb  3 00:24:28 2009	(r16963)
+++ trunk/libavformat/aiff.c	Tue Feb  3 00:25:02 2009	(r16964)
@@ -81,13 +81,7 @@ static int get_tag(ByteIOContext *pb, ui
 /* 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;