# HG changeset patch # User aurel # Date 1279748144 0 # Node ID 660647077ab9516c97373ad3966d4e46f808f9b4 # Parent eb7e896070d9d97490aee1dc88f24df45c20f567 rename get_line to ff_get_line diff -r eb7e896070d9 -r 660647077ab9 assdec.c --- a/assdec.c Wed Jul 21 17:27:28 2010 +0000 +++ b/assdec.c Wed Jul 21 21:35:44 2010 +0000 @@ -30,7 +30,7 @@ unsigned int event_index; }ASSContext; -static void get_line(ByteIOContext *s, char *buf, int maxlen) +static void ff_get_line(ByteIOContext *s, char *buf, int maxlen) { int i = 0; char c; @@ -108,7 +108,7 @@ while(!url_feof(pb)){ uint8_t line[MAX_LINESIZE]; - get_line(pb, line, sizeof(line)); + ff_get_line(pb, line, sizeof(line)); if(!memcmp(line, "[Events]", 8)) header_remaining= 2;