diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:18:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:48:42 +0100 |
| commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
| tree | bffb2d72049108372cbe46273998f3790dc860f0 /libavformat/applehttpproto.c | |
| parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
| parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/applehttpproto.c')
| -rw-r--r-- | libavformat/applehttpproto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/applehttpproto.c b/libavformat/applehttpproto.c index 471f94bd2a..4b7e9c72a9 100644 --- a/libavformat/applehttpproto.c +++ b/libavformat/applehttpproto.c @@ -318,7 +318,7 @@ retry: return AVERROR_EOF; while (av_gettime() - s->last_load_time < s->target_duration*1000000) { if (url_interrupt_cb()) - return AVERROR(EINTR); + return AVERROR_EXIT; usleep(100*1000); } goto retry; @@ -328,7 +328,7 @@ retry: ret = url_open(&s->seg_hd, url, URL_RDONLY); if (ret < 0) { if (url_interrupt_cb()) - return AVERROR(EINTR); + return AVERROR_EXIT; av_log(NULL, AV_LOG_WARNING, "Unable to open %s\n", url); s->cur_seq_no++; goto retry; |