From 8a810ccbba3b4d58ed27251f68ac88a0cb40b227 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 21 Jul 2010 21:41:46 +0000 Subject: use return value of ff_get_line() Originally committed as revision 24402 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/assdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/assdec.c') diff --git a/libavformat/assdec.c b/libavformat/assdec.c index ecc9a07888..ff1009c1ce 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -74,7 +74,7 @@ static int event_cmp(uint8_t **a, uint8_t **b) static int read_header(AVFormatContext *s, AVFormatParameters *ap) { - int i, header_remaining; + int i, len, header_remaining; ASSContext *ass = s->priv_data; ByteIOContext *pb = s->pb; AVStream *st; @@ -95,7 +95,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) while(!url_feof(pb)){ uint8_t line[MAX_LINESIZE]; - ff_get_line(pb, line, sizeof(line)); + len = ff_get_line(pb, line, sizeof(line)); if(!memcmp(line, "[Events]", 8)) header_remaining= 2; @@ -111,8 +111,8 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) if(!p) goto fail; *(dst[i])= p; - memcpy(p + pos[i], line, strlen(line)+1); - pos[i] += strlen(line); + memcpy(p + pos[i], line, len+1); + pos[i] += len; if(i) ass->event_count++; else header_remaining--; } -- cgit v1.2.3