diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-02-02 23:25:02 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-02-02 23:25:02 +0000 |
| commit | be62f5569e40a578ffed8662c4f98182c0a15fe3 (patch) | |
| tree | b704ec99088acc4c6bb4025a6b47f83584043345 | |
| parent | f8ca63e8e4b985ae3ce21ba224165dcff2023d0e (diff) | |
| download | ffmpeg-be62f5569e40a578ffed8662c4f98182c0a15fe3.tar.gz | |
simplify
Originally committed as revision 16964 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/aiff.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavformat/aiff.c b/libavformat/aiff.c index 70569ed5a9..6ddf633acf 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; |