[FFmpeg-cvslog] avformat/async: rename async_interrupt_callback to async_check_interrupt
Zhang Rui
git at videolan.org
Tue Jul 21 21:28:31 CEST 2015
ffmpeg | branch: master | Zhang Rui <bbcallen at gmail.com> | Wed Jul 22 02:47:24 2015 +0800| [830d3a0ebe24600ebd1f27767204db5f7d059ea1] | committer: Michael Niedermayer
avformat/async: rename async_interrupt_callback to async_check_interrupt
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=830d3a0ebe24600ebd1f27767204db5f7d059ea1
---
libavformat/async.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavformat/async.c b/libavformat/async.c
index 54021e7..c523b3d 100644
--- a/libavformat/async.c
+++ b/libavformat/async.c
@@ -71,7 +71,7 @@ typedef struct Context {
AVIOInterruptCB interrupt_callback;
} Context;
-static int async_interrupt_callback(void *arg)
+static int async_check_interrupt(void *arg)
{
URLContext *h = arg;
Context *c = h->priv_data;
@@ -95,7 +95,7 @@ static void *async_buffer_task(void *arg)
while (1) {
int fifo_space, to_copy;
- if (async_interrupt_callback(h)) {
+ if (async_check_interrupt(h)) {
c->io_eof_reached = 1;
c->io_error = AVERROR_EXIT;
break;
@@ -154,7 +154,7 @@ static int async_open(URLContext *h, const char *arg, int flags, AVDictionary **
{
Context *c = h->priv_data;
int ret;
- AVIOInterruptCB interrupt_callback = {.callback = async_interrupt_callback, .opaque = h};
+ AVIOInterruptCB interrupt_callback = {.callback = async_check_interrupt, .opaque = h};
av_strstart(arg, "async:", &arg);
@@ -250,7 +250,7 @@ static int async_read_internal(URLContext *h, void *dest, int size, int read_com
while (to_read > 0) {
int fifo_size, to_copy;
- if (async_interrupt_callback(h)) {
+ if (async_check_interrupt(h)) {
ret = AVERROR_EXIT;
break;
}
@@ -342,7 +342,7 @@ static int64_t async_seek(URLContext *h, int64_t pos, int whence)
c->seek_ret = 0;
while (1) {
- if (async_interrupt_callback(h)) {
+ if (async_check_interrupt(h)) {
ret = AVERROR_EXIT;
break;
}
More information about the ffmpeg-cvslog
mailing list