From be62f5569e40a578ffed8662c4f98182c0a15fe3 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Mon, 2 Feb 2009 23:25:02 +0000
Subject: [PATCH] simplify
Originally committed as revision 16964 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/aiff.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 70569ed5a90..6ddf633acf6 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -81,13 +81,7 @@ static int get_tag(ByteIOContext *pb, uint32_t * tag)
/* 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;
--
GitLab