aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-23 01:41:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-03 22:26:06 +0100
commit12d0e44bdbe1421d828db7a84cbedeb6f2eb8f6b (patch)
treea359ef7e4cd127aeeb176b60beb15815c2c0031f
parent857d64a58cf2998d330d6bfb3d51b62c38d09ab1 (diff)
downloadffmpeg-12d0e44bdbe1421d828db7a84cbedeb6f2eb8f6b.tar.gz
udp: return circular buffer error if such error happened.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3dcbafc777513621e423c2f23b1725559230383d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/udp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/udp.c b/libavformat/udp.c
index a0d127c614..5eb6cd1f86 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -556,6 +556,8 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
av_fifo_generic_read(s->fifo, buf, avail, NULL);
av_fifo_drain(s->fifo, AV_RL32(tmp) - avail);
return avail;
+ } else if(s->circular_buffer_error){
+ return s->circular_buffer_error;
}
else {
FD_ZERO(&rfds);