Browse Source

ffserver deallocate ctx->streams on closing patch by (Mark Hills <mark at pogo dot org dot uk>)

Originally committed as revision 1704 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Mark Hills Michael Niedermayer 23 years ago
parent
commit
b88ba82315
2 changed files with 8 additions and 7 deletions
  1. +5
    -1
      ffserver.c
  2. +3
    -6
      libavformat/aviobuf.c

+ 5
- 1
ffserver.c View File

@@ -744,8 +744,12 @@ static void close_connection(HTTPContext *c)
}
}

ctx = &c->fmt_ctx;

for(i=0; i<ctx->nb_streams; i++)
av_free(ctx->streams[i]) ;

if (!c->last_packet_sent) {
ctx = &c->fmt_ctx;
if (ctx->oformat) {
/* prepare header */
if (url_open_dyn_buf(&ctx->pb) >= 0) {


+ 3
- 6
libavformat/aviobuf.c View File

@@ -569,12 +569,9 @@ static void dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
}
if (new_allocated_size > d->allocated_size) {
new_buffer = av_malloc(new_allocated_size);
if (!new_buffer)
return;
memcpy(new_buffer, d->buffer, d->size);
av_free(d->buffer);
d->buffer = new_buffer;
d->buffer = av_realloc(d->buffer, new_allocated_size);
if(d->buffer == NULL)
return ;
d->allocated_size = new_allocated_size;
}
memcpy(d->buffer + d->pos, buf, buf_size);


Loading…
Cancel
Save