lavf: use av_fifo_freep

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
pull/68/head
Lukasz Marek 11 years ago
parent a5f2f33a67
commit ce1eefe691
  1. 2
      libavformat/audiointerleave.c
  2. 4
      libavformat/dvenc.c
  3. 2
      libavformat/mpegenc.c
  4. 3
      libavformat/swfenc.c
  5. 4
      libavformat/udp.c

@ -34,7 +34,7 @@ void ff_audio_interleave_close(AVFormatContext *s)
AudioInterleaveContext *aic = st->priv_data;
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
av_fifo_free(aic->fifo);
av_fifo_freep(&aic->fifo);
}
}

@ -334,7 +334,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
if (c->ast[i] && !(c->audio_data[i]=av_fifo_alloc(100*MAX_AUDIO_FRAME_SIZE))) {
while (i > 0) {
i--;
av_fifo_free(c->audio_data[i]);
av_fifo_freep(&c->audio_data[i]);
}
goto bail_out;
}
@ -350,7 +350,7 @@ static void dv_delete_mux(DVMuxContext *c)
{
int i;
for (i=0; i < c->n_ast; i++)
av_fifo_free(c->audio_data[i]);
av_fifo_freep(&c->audio_data[i]);
}
static int dv_write_header(AVFormatContext *s)

@ -1159,7 +1159,7 @@ static int mpeg_mux_end(AVFormatContext *ctx)
stream = ctx->streams[i]->priv_data;
assert(av_fifo_size(stream->fifo) == 0);
av_fifo_free(stream->fifo);
av_fifo_freep(&stream->fifo);
}
return 0;
}

@ -490,8 +490,7 @@ static int swf_write_trailer(AVFormatContext *s)
if (enc->codec_type == AVMEDIA_TYPE_VIDEO)
video_enc = enc;
else {
av_fifo_free(swf->audio_fifo);
swf->audio_fifo = NULL;
av_fifo_freep(&swf->audio_fifo);
}
}

@ -761,7 +761,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
fail:
if (udp_fd >= 0)
closesocket(udp_fd);
av_fifo_free(s->fifo);
av_fifo_freep(&s->fifo);
for (i = 0; i < num_include_sources; i++)
av_freep(&include_sources[i]);
for (i = 0; i < num_exclude_sources; i++)
@ -867,7 +867,7 @@ static int udp_close(URLContext *h)
pthread_cond_destroy(&s->cond);
}
#endif
av_fifo_free(s->fifo);
av_fifo_freep(&s->fifo);
return 0;
}

Loading…
Cancel
Save