Originally committed as revision 16964 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2009-02-02 23:25:02 +00:00
parent f8ca63e8e4
commit be62f5569e
1 changed files with 1 additions and 7 deletions

View File

@ -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;