From 5e2098d9064e130e603018c8185f591fbcfd5873 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Wed, 22 Jul 2015 02:47:23 +0800 Subject: [PATCH] avformat/async: fix interrupt_callback usage and return code Signed-off-by: Michael Niedermayer --- libavformat/async.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/async.c b/libavformat/async.c index c2df274c7d..54021e7143 100644 --- a/libavformat/async.c +++ b/libavformat/async.c @@ -75,13 +75,12 @@ static int async_interrupt_callback(void *arg) { URLContext *h = arg; Context *c = h->priv_data; - int ret = 0; - if (c->interrupt_callback.callback) { - ret = c->interrupt_callback.callback(c->interrupt_callback.opaque); - if (!ret) - return ret; - } + if (c->abort_request) + return 1; + + if (ff_check_interrupt(&c->interrupt_callback)) + c->abort_request = 1; return c->abort_request; }