virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

udp: Fix sign of error codes.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-02-23 23:22:16 +01:00
parent b6ff81d63b
commit 29a8f6b8d4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/udp.c
View File

@@ -335,7 +335,7 @@ static void *circular_buffer_task( void *_URLContext)
int len; int len;
if (ff_check_interrupt(&h->interrupt_callback)) { if (ff_check_interrupt(&h->interrupt_callback)) {
s->circular_buffer_error = EINTR; s->circular_buffer_error = AVERROR(EINTR);
goto end; goto end;
} }
@@ -347,7 +347,7 @@ static void *circular_buffer_task( void *_URLContext)
if (ret < 0) { if (ret < 0) {
if (ff_neterrno() == AVERROR(EINTR)) if (ff_neterrno() == AVERROR(EINTR))
continue; continue;
s->circular_buffer_error = EIO; s->circular_buffer_error = AVERROR(EIO);
goto end; goto end;
} }
@@ -361,14 +361,14 @@ static void *circular_buffer_task( void *_URLContext)
/* No Space left, error, what do we do now */ /* No Space left, error, what do we do now */
if(left < UDP_MAX_PKT_SIZE + 4) { if(left < UDP_MAX_PKT_SIZE + 4) {
av_log(h, AV_LOG_ERROR, "circular_buffer: OVERRUN\n"); av_log(h, AV_LOG_ERROR, "circular_buffer: OVERRUN\n");
s->circular_buffer_error = EIO; s->circular_buffer_error = AVERROR(EIO);
goto end; goto end;
} }
left = FFMIN(left, s->fifo->end - s->fifo->wptr); left = FFMIN(left, s->fifo->end - s->fifo->wptr);
len = recv(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0); len = recv(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0);
if (len < 0) { if (len < 0) {
if (ff_neterrno() != AVERROR(EAGAIN) && ff_neterrno() != AVERROR(EINTR)) { if (ff_neterrno() != AVERROR(EAGAIN) && ff_neterrno() != AVERROR(EINTR)) {
s->circular_buffer_error = EIO; s->circular_buffer_error = AVERROR(EIO);
goto end; goto end;
} }
continue; continue;