From c76374c6db5f486672f9df223f43e4892bd655c9 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Sun, 13 Mar 2011 00:42:27 +0100 Subject: Use AVERROR_EXIT with url_interrupt_cb. Functions interrupted by url_interrupt_cb should not be restarted. Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish when the underlying system call was interrupted and actually needed to be restarted. This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed content). Signed-off-by: Nicolas George Signed-off-by: Ronald S. Bultje --- libavformat/udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/udp.c') diff --git a/libavformat/udp.c b/libavformat/udp.c index 0196573209..76a0f35099 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -452,7 +452,7 @@ static int udp_read(URLContext *h, uint8_t *buf, int size) for(;;) { if (url_interrupt_cb()) - return AVERROR(EINTR); + return AVERROR_EXIT; ret = poll(&p, 1, 100); if (ret < 0) { if (ff_neterrno() == AVERROR(EINTR)) -- cgit v1.2.3