diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:40:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 00:41:02 +0100 |
| commit | 3efe5e3b094ae8561b31416adb80de33ccd04234 (patch) | |
| tree | 0f055b630f5d3cb5da8587b57b65e88ac1356c2c /libavformat/rtspdec.c | |
| parent | 44967ab60a9baf62f86bc727b51ff0acb587e676 (diff) | |
| parent | 70e981cf5d75abc9bff076969270b587a0004d3f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtspdec: Fix keep-alive request for ACTi cameras
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtspdec.c')
| -rw-r--r-- | libavformat/rtspdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index eb650ff42a..74a7bf646f 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -877,7 +877,7 @@ retry: rt->get_parameter_supported)) { ff_rtsp_send_cmd_async(s, "GET_PARAMETER", rt->control_uri, NULL); } else { - ff_rtsp_send_cmd_async(s, "OPTIONS", "*", NULL); + ff_rtsp_send_cmd_async(s, "OPTIONS", rt->control_uri, NULL); } /* The stale flag should be reset when creating the auth response in * ff_rtsp_send_cmd_async, but reset it here just in case we never |