diff options
| author | Martin Storsjö <martin@martin.st> | 2010-07-28 09:26:15 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-07-28 09:26:15 +0000 |
| commit | 2845006608154cf7db169bc53e0c2f3fbc6badd8 (patch) | |
| tree | 244a4a24143edea6af973e8b3601b79648df3a48 | |
| parent | 15379c2bebd94903a7b8f932dc1c56ab5c0212b0 (diff) | |
| download | ffmpeg-2845006608154cf7db169bc53e0c2f3fbc6badd8.tar.gz | |
rtsp: Move the definition of SDP_MAX_SIZE up, use it in the RTSP muxer, too
Originally committed as revision 24571 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rtsp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 7dede4c875..6ad0953ebb 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -52,6 +52,7 @@ int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP); #define SELECT_TIMEOUT_MS 100 #define READ_PACKET_TIMEOUT_S 10 #define MAX_TIMEOUTS READ_PACKET_TIMEOUT_S * 1000 / SELECT_TIMEOUT_MS +#define SDP_MAX_SIZE 8192 static void get_word_until_chars(char *buf, int buf_size, const char *sep, const char **pp) @@ -1295,7 +1296,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr) rt->start_time = av_gettime(); /* Announce the stream */ - sdp = av_mallocz(8192); + sdp = av_mallocz(SDP_MAX_SIZE); if (sdp == NULL) return AVERROR(ENOMEM); /* We create the SDP based on the RTSP AVFormatContext where we @@ -1314,7 +1315,7 @@ static int rtsp_setup_output_streams(AVFormatContext *s, const char *addr) ff_url_join(sdp_ctx.filename, sizeof(sdp_ctx.filename), "rtsp", NULL, addr, -1, NULL); ctx_array[0] = &sdp_ctx; - if (avf_sdp_create(ctx_array, 1, sdp, 8192)) { + if (avf_sdp_create(ctx_array, 1, sdp, SDP_MAX_SIZE)) { av_free(sdp); return AVERROR_INVALIDDATA; } @@ -2003,8 +2004,6 @@ static int sdp_probe(AVProbeData *p1) return 0; } -#define SDP_MAX_SIZE 8192 - static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap) { RTSPState *rt = s->priv_data; |