diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 12:32:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 12:38:24 +0200 |
| commit | 2fe5e3e9702d1136e77e0ec1258d320ea5e7a976 (patch) | |
| tree | 950112c778e968effc7da1eb750c9e552ed39e0a | |
| parent | 4aa2874ab1d06072dc2c8576a907a51e056b5ccc (diff) | |
| parent | 1dd1b2332ebbac710d8e0214cec7595e118f2105 (diff) | |
| download | ffmpeg-2fe5e3e9702d1136e77e0ec1258d320ea5e7a976.tar.gz | |
Merge commit '1dd1b2332ebbac710d8e0214cec7595e118f2105'
* commit '1dd1b2332ebbac710d8e0214cec7595e118f2105':
rtsp: Include an User-Agent header field in all requests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtsp.c | 5 | ||||
| -rw-r--r-- | libavformat/rtspdec.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5421bb2a6f..3a07e9c91c 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -62,8 +62,6 @@ #define DEC AV_OPT_FLAG_DECODING_PARAM #define ENC AV_OPT_FLAG_ENCODING_PARAM -#define DEFAULT_USER_AGENT "Lavf/" AV_STRINGIFY(LIBAVFORMAT_VERSION) - #define RTSP_FLAG_OPTS(name, longname) \ { name, longname, OFFSET(rtsp_flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, DEC, "rtsp_flags" }, \ { "filter_src", "Only receive packets from the negotiated peer IP", 0, AV_OPT_TYPE_CONST, {.i64 = RTSP_FLAG_FILTER_SRC}, 0, 0, DEC, "rtsp_flags" }, \ @@ -93,7 +91,7 @@ const AVOption ff_rtsp_options[] = { { "timeout", "Maximum timeout (in seconds) to wait for incoming connections. -1 is infinite. Implies flag listen", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC }, { "stimeout", "timeout (in micro seconds) of socket i/o operations.", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, RTSP_REORDERING_OPTS(), - { "user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = DEFAULT_USER_AGENT}, 0, 0, DEC }, + { "user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC }, { NULL }, }; @@ -1138,6 +1136,7 @@ static int rtsp_send_cmd_with_content_async(AVFormatContext *s, if (headers) av_strlcat(buf, headers, sizeof(buf)); av_strlcatf(buf, sizeof(buf), "CSeq: %d\r\n", rt->seq); + av_strlcatf(buf, sizeof(buf), "User-Agent: %s\r\n", rt->user_agent); if (rt->session_id[0] != '\0' && (!headers || !strstr(headers, "\nIf-Match:"))) { av_strlcatf(buf, sizeof(buf), "Session: %s\r\n", rt->session_id); diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 99a21cdd14..da571a8ee8 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -574,8 +574,6 @@ int ff_rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply) /* describe the stream */ snprintf(cmd, sizeof(cmd), "Accept: application/sdp\r\n"); - av_strlcatf(cmd, sizeof(cmd), - "User-Agent: %s\r\n", rt->user_agent); if (rt->server_type == RTSP_SERVER_REAL) { /** * The Require: attribute is needed for proper streaming from |