move ff_get_line to aviobuf.c

Originally committed as revision 24399 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 0fc9e8a..ecc9a07 100644 (file)
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -20,6 +20,7 @@
  */
 
 #include "avformat.h"
+#include "internal.h"
 
 #define MAX_LINESIZE 2000
 
@@ -30,20 +31,6 @@ typedef struct ASSContext{
     unsigned int event_index;
 }ASSContext;
 
-static void ff_get_line(ByteIOContext *s, char *buf, int maxlen)
-{
-    int i = 0;
-    char c;
-
-    do{
-        c = get_byte(s);
-        if (i < maxlen-1)
-            buf[i++] = c;
-    }while(c != '\n' && c);
-
-    buf[i] = 0;
-}
-
 static int probe(AVProbeData *p)
 {
     const char *header= "[Script Info]";

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 31ce64e..264d2de 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -554,6 +554,20 @@ char *get_strz(ByteIOContext *s, char *buf, int maxlen)
     return buf;
 }
 
+void ff_get_line(ByteIOContext *s, char *buf, int maxlen)
+{
+    int i = 0;
+    char c;
+
+    do {
+        c = get_byte(s);
+        if (i < maxlen-1)
+            buf[i++] = c;
+    } while (c != '\n' && c);
+
+    buf[i] = 0;
+}
+
 uint64_t get_be64(ByteIOContext *s)
 {
     uint64_t val;

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 29d735c..5833ef0 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -167,6 +167,8 @@ int ff_get_v_length(uint64_t val);
  */
 void ff_put_v(ByteIOContext *bc, uint64_t val);
 
+void ff_get_line(ByteIOContext *s, char *buf, int maxlen);
+
 #define SPACE_CHARS " \t\r\n"
 
 #endif /* AVFORMAT_INTERNAL_H */