diff options
| author | wm4 <nfxjfg@googlemail.com> | 2018-01-24 08:04:38 +0100 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2018-01-27 04:10:52 +0100 |
| commit | 23ffeb91fe46f6f95348731396ccfdb7fbff0337 (patch) | |
| tree | 5a42f1c56d0931e853dc6b4d82574ba958351421 /libavformat | |
| parent | 6194d7e56454897b9c5d9d52e82376b2a6e6b85c (diff) | |
| download | ffmpeg-23ffeb91fe46f6f95348731396ccfdb7fbff0337.tar.gz | |
hls: don't print a certain warning if playlist loading is aborted
AVERROR_EXIT happens when the user's interrupt callback signals that
playback should be aborted. In this case, the demuxer shouldn't print a
warning, as it's expected that all network accesses are stopped.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/hls.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index 6e1a2e3f1e..02e764f932 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1422,8 +1422,9 @@ reload: if (!v->finished && av_gettime_relative() - v->last_load_time >= reload_interval) { if ((ret = parse_playlist(c, v->url, v, NULL)) < 0) { - av_log(v->parent, AV_LOG_WARNING, "Failed to reload playlist %d\n", - v->index); + if (ret != AVERROR_EXIT) + av_log(v->parent, AV_LOG_WARNING, "Failed to reload playlist %d\n", + v->index); return ret; } /* If we need to reload the playlist again below (if |