Module: libav
Branch: release/11
Commit: c7e0722b1a65b8067bc98ad17a5c066a35737252

Author:    Martin Storsjö <[email protected]>
Committer: Martin Storsjö <[email protected]>
Date:      Thu Mar 24 11:27:49 2016 +0200

tls: Use the right return value for breaking out due to the interrupt callback

The retry_transfer_wrapper function higher up in the call chain
ignores AVERROR(EINTR), which only means "interrupted by system call".

This makes sure that returning due to the interrupt callback
works as intended.

CC: [email protected]
Signed-off-by: Martin Storsjö <[email protected]>

---

 libavformat/tls.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 7c78fda..3b00cb5 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -132,7 +132,7 @@ static int do_tls_poll(URLContext *h, int ret)
         if (n > 0)
             break;
         if (ff_check_interrupt(&h->interrupt_callback))
-            return AVERROR(EINTR);
+            return AVERROR_EXIT;
     }
     return 0;
 }

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to