[SCM] libav/experimental: Factor retry_transfer_wrapper() out of url_read_complete()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a46f7516eccd307416e5ecf8760749a3368ee815
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Oct 6 11:18:38 2010 +0000

    Factor retry_transfer_wrapper() out of url_read_complete()
    
    Originally committed as revision 25367 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 4399878..bf0d9d8 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -215,14 +215,15 @@ int url_read(URLContext *h, unsigned char *buf, int size)
     return ret;
 }
 
-int url_read_complete(URLContext *h, unsigned char *buf, int size)
+static inline int retry_transfer_wrapper(URLContext *h, unsigned char *buf, int size,
+                                         int (*transfer_func)(URLContext *h, unsigned char *buf, int size))
 {
     int ret, len;
     int fast_retries = 5;
 
     len = 0;
     while (len < size) {
-        ret = url_read(h, buf+len, size-len);
+        ret = transfer_func(h, buf+len, size-len);
         if (ret == AVERROR(EAGAIN)) {
             ret = 0;
             if (fast_retries)
@@ -238,6 +239,11 @@ int url_read_complete(URLContext *h, unsigned char *buf, int size)
     return len;
 }
 
+int url_read_complete(URLContext *h, unsigned char *buf, int size)
+{
+    return retry_transfer_wrapper(h, buf, size, url_read);
+}
+
 int url_write(URLContext *h, const unsigned char *buf, int size)
 {
     int ret;

-- 
Libav/FFmpeg packaging