Revision c60112f2 libavformat/applehttpproto.c

View differences:

libavformat/applehttpproto.c
195 195
        av_strlcpy(s->playlisturl, "http://", sizeof(s->playlisturl));
196 196
        av_strlcat(s->playlisturl, nested_url, sizeof(s->playlisturl));
197 197
    } else {
198
        av_log(NULL, AV_LOG_ERROR, "Unsupported url %s\n", uri);
198
        av_log(h, AV_LOG_ERROR, "Unsupported url %s\n", uri);
199 199
        ret = AVERROR(EINVAL);
200 200
        goto fail;
201 201
    }
......
218 218
    }
219 219

  
220 220
    if (s->n_segments == 0) {
221
        av_log(NULL, AV_LOG_WARNING, "Empty playlist\n");
221
        av_log(h, AV_LOG_WARNING, "Empty playlist\n");
222 222
        ret = AVERROR(EIO);
223 223
        goto fail;
224 224
    }
......
258 258
                return ret;
259 259
    }
260 260
    if (s->cur_seq_no < s->start_seq_no) {
261
        av_log(NULL, AV_LOG_WARNING,
261
        av_log(h, AV_LOG_WARNING,
262 262
               "skipping %d segments ahead, expired from playlist\n",
263 263
               s->start_seq_no - s->cur_seq_no);
264 264
        s->cur_seq_no = s->start_seq_no;
......
274 274
        goto retry;
275 275
    }
276 276
    url = s->segments[s->cur_seq_no - s->start_seq_no]->url,
277
    av_log(NULL, AV_LOG_DEBUG, "opening %s\n", url);
277
    av_log(h, AV_LOG_DEBUG, "opening %s\n", url);
278 278
    ret = ffurl_open(&s->seg_hd, url, AVIO_FLAG_READ);
279 279
    if (ret < 0) {
280 280
        if (url_interrupt_cb())
281 281
            return AVERROR_EXIT;
282
        av_log(NULL, AV_LOG_WARNING, "Unable to open %s\n", url);
282
        av_log(h, AV_LOG_WARNING, "Unable to open %s\n", url);
283 283
        s->cur_seq_no++;
284 284
        goto retry;
285 285
    }

Also available in: Unified diff