[FFmpeg-cvslog] r24833 - in trunk/libavformat: http.c internal.h

[mstorsjo]

Author: mstorsjo
Date: Thu Aug 19 16:50:40 2010
New Revision: 24833

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

Modified:
   trunk/libavformat/http.c
   trunk/libavformat/internal.h

Modified: trunk/libavformat/http.c
==============================================================================
--- trunk/libavformat/http.c	Thu Aug 19 16:49:53 2010	(r24832)
+++ trunk/libavformat/http.c	Thu Aug 19 16:50:40 2010	(r24833)
@@ -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, cons
     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);
 }

Modified: trunk/libavformat/internal.h
==============================================================================
--- trunk/libavformat/internal.h	Thu Aug 19 16:49:53 2010	(r24832)
+++ trunk/libavformat/internal.h	Thu Aug 19 16:50:40 2010	(r24833)
@@ -24,6 +24,8 @@
 #include <stdint.h>
 #include "avformat.h"
 
+#define MAX_URL_SIZE 4096
+
 typedef struct AVCodecTag {
     enum CodecID id;
     unsigned int tag;