diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:23:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:37:05 +0200 |
commit | 10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2 (patch) | |
tree | ad169614a86989dbb4ead1e188d2ad71ef7bfcf7 /libavformat/applehttpproto.c | |
parent | 2c18893a911657205bd45ff8a666882610e57700 (diff) | |
parent | f83acb096c0ea1ec181941c141d1ab6fb24820eb (diff) |
Merge remote branch 'qatar/master'
* qatar/master:
Makefile: Include dependencies for test tools, too
Remove a version check in av_log made unnecessary by the big bump.
update last major version increase dates in APIchanges
Reduce picture size for yadif.
oggdec: use av_freep() instead of av_free()
avio: Fix sanity checks in ffurl_read*
libavformat: Free AVFormatContext->streams
libavformat: Make protocols pass URLContext as log context where available
asf: remove commented out code in asf_read_seek
not pulled: libpostproc: Remove crufty code disabled by the big bump.
Reflect 0.7_beta1 release in the Changelog
not pulled: sws: remove disabled cruft.
lavu: remove disabled ff_random_get_seed cruft.
lavu: remove disabled sha1 cruft.
Conflicts:
Changelog
libavutil/sha1.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/applehttpproto.c')
-rw-r--r-- | libavformat/applehttpproto.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/applehttpproto.c b/libavformat/applehttpproto.c index f908584bf1..3a4d4b8100 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; } |