hls: don't print a certain warning if playlist loading is aborted
authorwm4 <nfxjfg@googlemail.com>
Wed, 24 Jan 2018 07:04:38 +0000 (08:04 +0100)
committerwm4 <nfxjfg@googlemail.com>
Sat, 27 Jan 2018 03:10:52 +0000 (04:10 +0100)
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.

libavformat/hls.c

index 6e1a2e3..02e764f 100644 (file)
@@ -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