summaryrefslogtreecommitdiff
path: root/libavformat/rtspdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-01 19:40:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-01 19:40:20 +0100
commit1295377f0a9de3140330d4467347f10d03ec4169 (patch)
tree8b5b652ae983e4b56fa685a828d81b7707fa5d7e /libavformat/rtspdec.c
parent04894ef32e325e33d420e15c16e3714e0f95fdb0 (diff)
parent50aef03b24d949249b020226dffa3a78077f1056 (diff)
Merge remote-tracking branch 'qatar/master'
* qatar/master: rtspenc: Make sure BYE packets are sent before TEARDOWN Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtspdec.c')
-rw-r--r--libavformat/rtspdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 3615226ac0..eb650ff42a 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -769,7 +769,7 @@ static int resetup_tcp(AVFormatContext *s)
av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, NULL, 0,
s->filename);
- ff_rtsp_undo_setup(s);
+ ff_rtsp_undo_setup(s, 0);
return ff_rtsp_make_setup_request(s, host, port, RTSP_LOWER_TRANSPORT_TCP,
rt->real_challenge);
}