changeset 6299:660647077ab9 libavformat

rename get_line to ff_get_line
author aurel
date Wed, 21 Jul 2010 21:35:44 +0000
parents eb7e896070d9
children e62d23b0547d
files assdec.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;