summaryrefslogtreecommitdiff
path: root/libavformat/mmsh.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-31 20:45:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-10-31 20:45:12 +0100
commitaedb87c57edf6fa7e7046da86540d9cf11b84f65 (patch)
treeb00b0b36bdada683fcdd90d61de9b1af890c7bed /libavformat/mmsh.c
parentdf98446ba3b4a7775d5b79d9115dd837f309d991 (diff)
mmsh: move location storage into context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mmsh.c')
-rw-r--r--libavformat/mmsh.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c
index 029baed211..b63ad025b2 100644
--- a/libavformat/mmsh.c
+++ b/libavformat/mmsh.c
@@ -55,6 +55,7 @@ typedef enum {
typedef struct {
MMSContext mms;
+ uint8_t location[1024];
int request_seq; ///< request packet sequence
int chunk_seq; ///< data packet sequence
} MMSHContext;
@@ -213,7 +214,7 @@ static int get_http_header_data(MMSHContext *mmsh)
static int mmsh_open(URLContext *h, const char *uri, int flags)
{
int i, port, err;
- char httpname[256], path[256], host[128], location[1024];
+ char httpname[256], path[256], host[128];
char *stream_selection = NULL;
char headers[1024];
MMSHContext *mmsh;
@@ -224,10 +225,10 @@ static int mmsh_open(URLContext *h, const char *uri, int flags)
return AVERROR(ENOMEM);
mmsh->request_seq = h->is_streamed = 1;
mms = &mmsh->mms;
- av_strlcpy(location, uri, sizeof(location));
+ av_strlcpy(mmsh->location, uri, sizeof(mmsh->location));
av_url_split(NULL, 0, NULL, 0,
- host, sizeof(host), &port, path, sizeof(path), location);
+ host, sizeof(host), &port, path, sizeof(path), mmsh->location);
if (port<0)
port = 80; // default mmsh protocol port
ff_url_join(httpname, sizeof(httpname), "http", NULL, host, port, "%s", path);