OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e85b5e
)
retry_transfer_wrapper(): check for interrupt before operation
author
Andrey Utkin
<andrey.krieger.utkin@gmail.com>
Wed, 10 Jul 2013 21:19:05 +0000
(
00:19
+0300)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 12 Jul 2013 19:27:27 +0000
(21:27 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avio.c
patch
|
blob
|
history
diff --git
a/libavformat/avio.c
b/libavformat/avio.c
index
5916e46
..
2c7a35e
100644
(file)
--- a/
libavformat/avio.c
+++ b/
libavformat/avio.c
@@
-273,6
+273,8
@@
static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
len = 0;
while (len < size_min) {
+ if (ff_check_interrupt(&h->interrupt_callback))
+ return AVERROR_EXIT;
ret = transfer_func(h, buf+len, size-len);
if (ret == AVERROR(EINTR))
continue;
@@
-296,8
+298,6
@@
static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
if (ret)
fast_retries = FFMAX(fast_retries, 2);
len += ret;
- if (len < size && ff_check_interrupt(&h->interrupt_callback))
- return AVERROR_EXIT;
}
return len;
}