Move the definition of the maximum url size for static buffers to internal.h

Originally committed as revision 24833 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/http.c b/libavformat/http.c
index 75bfd3a5f43a717ffe21e34209579b7802e830bb..e26da072cc9b7ac236b880c249ebd5171dab992b 100644 (file)
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -35,7 +35,6 @@
 
 /* used for protocol handling */
 #define BUFFER_SIZE 1024
-#define URL_SIZE    4096
 #define MAX_REDIRECTS 8
 
 typedef struct {
@@ -46,7 +45,7 @@ typedef struct {
     int http_code;
     int64_t chunksize;      /**< Used if "Transfer-Encoding: chunked" otherwise -1. */
     int64_t off, filesize;
-    char location[URL_SIZE];
+    char location[MAX_URL_SIZE];
     HTTPAuthState auth_state;
     unsigned char headers[BUFFER_SIZE];
     int willclose;          /**< Set if the server correctly handles Connection: close and will close the connection after feeding us the content. */
@@ -162,7 +161,7 @@ static int http_open(URLContext *h, const char *uri, int flags)
     h->is_streamed = 1;
 
     s->filesize = -1;
-    av_strlcpy(s->location, uri, URL_SIZE);
+    av_strlcpy(s->location, uri, sizeof(s->location));
 
     return http_open_cnx(h);
 }

diff --git a/libavformat/internal.h b/libavformat/internal.h
index 1b33fb153afc2dd0cd5913e983392d222f6b7da7..9f91d33b15babca5f887c0641e88348b3c49f1e6 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -24,6 +24,8 @@
 #include <stdint.h>
 #include "avformat.h"
 
+#define MAX_URL_SIZE 4096
+
 typedef struct AVCodecTag {
     enum CodecID id;
     unsigned int tag;