X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fhlsproto.c;h=e7ef2d88ea8d080594cc825f611b13076ad02ae5;hb=01ba52852d2ada3c79fe02a7de5bc1fdc27d56e8;hp=2b19ed0cf67a88d0fa6aa6e9ffd73f844eab7f4e;hpb=9a15af48284b951701b7e6b9dcc81b4212c6ca95;p=ffmpeg

diff --git a/libavformat/hlsproto.c b/libavformat/hlsproto.c
index 2b19ed0cf67..e7ef2d88ea8 100644
--- a/libavformat/hlsproto.c
+++ b/libavformat/hlsproto.c
@@ -69,14 +69,6 @@ typedef struct HLSContext {
     int64_t last_load_time;
 } HLSContext;
 
-static int read_chomp_line(AVIOContext *s, char *buf, int maxlen)
-{
-    int len = ff_get_line(s, buf, maxlen);
-    while (len > 0 && av_isspace(buf[len - 1]))
-        buf[--len] = '\0';
-    return len;
-}
-
 static void free_segment_list(HLSContext *s)
 {
     int i;
@@ -122,7 +114,7 @@ static int parse_playlist(URLContext *h, const char *url)
                                    h->protocol_whitelist, h->protocol_blacklist)) < 0)
         return ret;
 
-    read_chomp_line(in, line, sizeof(line));
+    ff_get_chomp_line(in, line, sizeof(line));
     if (strcmp(line, "#EXTM3U")) {
         ret = AVERROR_INVALIDDATA;
         goto fail;
@@ -131,7 +123,7 @@ static int parse_playlist(URLContext *h, const char *url)
     free_segment_list(s);
     s->finished = 0;
     while (!avio_feof(in)) {
-        read_chomp_line(in, line, sizeof(line));
+        ff_get_chomp_line(in, line, sizeof(line));
         if (av_strstart(line, "#EXT-X-STREAM-INF:", &ptr)) {
             struct variant_info info = {{0}};
             is_variant = 1;