RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use return value of ff_get_line() 

Originally committed as revision 24402 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-07-21 21:41:46 +00:00
parent b0335fd957
commit 8a810ccbba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/assdec.c
View File

@ -74,7 +74,7 @@ static int event_cmp(uint8_t **a, uint8_t **b)
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
int i, header_remaining; int i, len, header_remaining;
ASSContext *ass = s->priv_data; ASSContext *ass = s->priv_data;
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
AVStream *st; AVStream *st;
@ -95,7 +95,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
while(!url_feof(pb)){ while(!url_feof(pb)){
uint8_t line[MAX_LINESIZE]; 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)) if(!memcmp(line, "[Events]", 8))
header_remaining= 2; header_remaining= 2;
@ -111,8 +111,8 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
if(!p) if(!p)
goto fail; goto fail;
*(dst[i])= p; *(dst[i])= p;
memcpy(p + pos[i], line, strlen(line)+1); memcpy(p + pos[i], line, len+1);
pos[i] += strlen(line); pos[i] += len;
if(i) ass->event_count++; if(i) ass->event_count++;
else header_remaining--; else header_remaining--;
} }