diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:18:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-15 16:48:42 +0100 |
commit | 6947b0c42e0649f0c8355442d1732d642e467902 (patch) | |
tree | bffb2d72049108372cbe46273998f3790dc860f0 /libavformat/rtsp.c | |
parent | 27293b840ccae95ddb1f4d8af519e7962b0e373d (diff) | |
parent | c76374c6db5f486672f9df223f43e4892bd655c9 (diff) |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
-rw-r--r-- | libavformat/rtsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a24f12bacf..f50650ed8f 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1565,7 +1565,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, for (;;) { if (url_interrupt_cb()) - return AVERROR(EINTR); + return AVERROR_EXIT; if (wait_end && wait_end - av_gettime() < 0) return AVERROR(EAGAIN); max_p = 0; |