aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-07-21 21:35:44 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-07-21 21:35:44 +0000
commit80769fb73f20829cd2c1a0e8e56d41204b487049 (patch)
treeebd057aa691308bdbbbec6b1373092a93a99ad4a /libavformat
parentb8b231b5dc104192c0b766798a04cdf6e748472f (diff)
downloadffmpeg-80769fb73f20829cd2c1a0e8e56d41204b487049.tar.gz
rename get_line to ff_get_line
Originally committed as revision 24398 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/assdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 676fb39d6c..0fc9e8a772 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -30,7 +30,7 @@ typedef struct ASSContext{
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 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
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;