summaryrefslogtreecommitdiff
path: root/libavformat/applehttpproto.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-04-20 11:40:29 +0200
committerMartin Storsjö <martin@martin.st>2011-04-20 14:59:45 +0300
commitc60112f26873afafb55d24cc50a0e93ad9411373 (patch)
tree62d01be1c17198fe7593818536d1138821fc7ffd /libavformat/applehttpproto.c
parent8408e1d7d69aad57e633c27a6bcd522a15fa3702 (diff)
libavformat: Make protocols pass URLContext as log context where available
Since the libavformat major bump, URLContext contains an AVClass, making it a usable log context. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/applehttpproto.c')
-rw-r--r--libavformat/applehttpproto.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/applehttpproto.c b/libavformat/applehttpproto.c
index 8a9bcb1ade..37b289a1e0 100644
--- a/libavformat/applehttpproto.c
+++ b/libavformat/applehttpproto.c
@@ -195,7 +195,7 @@ static int applehttp_open(URLContext *h, const char *uri, int flags)
av_strlcpy(s->playlisturl, "http://", sizeof(s->playlisturl));
av_strlcat(s->playlisturl, nested_url, sizeof(s->playlisturl));
} else {
- av_log(NULL, AV_LOG_ERROR, "Unsupported url %s\n", uri);
+ av_log(h, AV_LOG_ERROR, "Unsupported url %s\n", uri);
ret = AVERROR(EINVAL);
goto fail;
}
@@ -218,7 +218,7 @@ static int applehttp_open(URLContext *h, const char *uri, int flags)
}
if (s->n_segments == 0) {
- av_log(NULL, AV_LOG_WARNING, "Empty playlist\n");
+ av_log(h, AV_LOG_WARNING, "Empty playlist\n");
ret = AVERROR(EIO);
goto fail;
}
@@ -258,7 +258,7 @@ retry:
return ret;
}
if (s->cur_seq_no < s->start_seq_no) {
- av_log(NULL, AV_LOG_WARNING,
+ av_log(h, AV_LOG_WARNING,
"skipping %d segments ahead, expired from playlist\n",
s->start_seq_no - s->cur_seq_no);
s->cur_seq_no = s->start_seq_no;
@@ -274,12 +274,12 @@ retry:
goto retry;
}
url = s->segments[s->cur_seq_no - s->start_seq_no]->url,
- av_log(NULL, AV_LOG_DEBUG, "opening %s\n", url);
+ av_log(h, AV_LOG_DEBUG, "opening %s\n", url);
ret = ffurl_open(&s->seg_hd, url, AVIO_FLAG_READ);
if (ret < 0) {
if (url_interrupt_cb())
return AVERROR_EXIT;
- av_log(NULL, AV_LOG_WARNING, "Unable to open %s\n", url);
+ av_log(h, AV_LOG_WARNING, "Unable to open %s\n", url);
s->cur_seq_no++;
goto retry;
}