ffmpeg | branch: master | Zhang Rui <bbcal...@gmail.com> | Wed Jul 22 02:47:23 2015 +0800| [5e2098d9064e130e603018c8185f591fbcfd5873] | committer: Michael Niedermayer
avformat/async: fix interrupt_callback usage and return code Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e2098d9064e130e603018c8185f591fbcfd5873 --- libavformat/async.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavformat/async.c b/libavformat/async.c index c2df274..54021e7 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
