summaryrefslogtreecommitdiff
path: root/libavformat/tcp.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-11-06 22:34:24 +0200
committerAnton Khirnov <anton@khirnov.net>2011-11-13 13:08:13 +0100
commit9957cdbfd5ced5baae6ec97b97b08f1ad42aa4e4 (patch)
tree3bb6c32c1443eda97524dbea69b60416a3bdc019 /libavformat/tcp.c
parentc4a090ddb564b87fd9d6d4f83e0f134a77c96007 (diff)
avformat: Use ff_check_interrupt
Diffstat (limited to 'libavformat/tcp.c')
-rw-r--r--libavformat/tcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index e602a556d2..fda34a368d 100644
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -100,7 +100,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
struct pollfd p = {fd, POLLOUT, 0};
ret = ff_neterrno();
if (ret == AVERROR(EINTR)) {
- if (url_interrupt_cb()) {
+ if (ff_check_interrupt(&h->interrupt_callback)) {
ret = AVERROR_EXIT;
goto fail1;
}
@@ -112,7 +112,7 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
/* wait until we are connected or until abort */
while(timeout--) {
- if (url_interrupt_cb()) {
+ if (ff_check_interrupt(&h->interrupt_callback)) {
ret = AVERROR_EXIT;
goto fail1;
}