diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 13:05:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-08 13:05:13 +0100 |
| commit | 48d30f6733368f317a61901c61a78a10402eea7b (patch) | |
| tree | 5e8c963e7256693f77c655f77addcfdb088e3460 /libavformat/rtsp.c | |
| parent | 249fca3df9f9790369d38aaa63c828c3e2a30936 (diff) | |
| parent | 8729698d50739524665090e083d1bfdf28235724 (diff) | |
| download | ffmpeg-48d30f6733368f317a61901c61a78a10402eea7b.tar.gz | |
Merge commit '8729698d50739524665090e083d1bfdf28235724'
* commit '8729698d50739524665090e083d1bfdf28235724':
rtsp: Recheck the reordering queue if getting a new packet
lavr: log channel conversion description for any-to-any functions
lavr: mix: reduce the mixing matrix when possible
lavr: cosmetics: reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index d1b6b422a2..5f6d738202 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1863,6 +1863,7 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt) rt->cur_transport_priv = NULL; } +redo: if (rt->transport == RTSP_TRANSPORT_RTP) { int i; int64_t first_queue_time = 0; @@ -1878,12 +1879,15 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt) first_queue_st = rt->rtsp_streams[i]; } } - if (first_queue_time) + if (first_queue_time) { wait_end = first_queue_time + s->max_delay; + } else { + wait_end = 0; + first_queue_st = NULL; + } } /* read next RTP packet */ - redo: if (!rt->recvbuf) { rt->recvbuf = av_malloc(RECVBUF_SIZE); if (!rt->recvbuf) |