[FFmpeg-cvslog] lavf/hlsenc: use ff_get_chomp_line
Jun Zhao
git at videolan.org
Thu Apr 12 11:10:12 EEST 2018
ffmpeg | branch: master | Jun Zhao <mypopydev at gmail.com> | Mon Apr 9 23:12:16 2018 +0800| [f1ccb4dbcf0b878120ba3990476ce7059ead2d74] | committer: Jun Zhao
lavf/hlsenc: use ff_get_chomp_line
Signed-off-by: Jun Zhao <mypopydev at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1ccb4dbcf0b878120ba3990476ce7059ead2d74
---
libavformat/hlsenc.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 8eb84212a0..01a06d8b26 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -696,14 +696,6 @@ static int hls_encryption_start(AVFormatContext *s)
return 0;
}
-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 int hls_mux_init(AVFormatContext *s, VariantStream *vs)
{
AVDictionary *options = NULL;
@@ -1072,7 +1064,7 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs
s->protocol_whitelist, s->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;
@@ -1080,7 +1072,7 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs
vs->discontinuity = 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-MEDIA-SEQUENCE:", &ptr)) {
int64_t tmp_sequence = strtoll(ptr, NULL, 10);
if (tmp_sequence < vs->sequence)
More information about the ffmpeg-cvslog
mailing list