[FFmpeg-devel] [PATCH 1/2] Revert "In retry_transfer_wrapper, do not check url_interrupt_cb, causes problems"

[Luca Barbato]

This reverts commit 688c22e033a48ebf84fb4b52642bbd40f11e9c4e.
---
 libavformat/avio.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 2265549..4ab1b6b 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -221,6 +221,8 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
 
     len = 0;
     while (len < size_min) {
+        if (url_interrupt_cb())
+            return AVERROR(EINTR);
         ret = transfer_func(h, buf+len, size-len);
         if (ret == AVERROR(EINTR))
             continue;
@@ -237,8 +239,6 @@ static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int
         if (ret)
            fast_retries = FFMAX(fast_retries, 2);
         len += ret;
-        if (url_interrupt_cb())
-            return AVERROR(EINTR);
     }
     return len;
 }
-- 
1.7.4.1