Commit ce1eefe6 authored by Lukasz Marek's avatar Lukasz Marek

lavf: use av_fifo_freep

Signed-off-by: 's avatarLukasz Marek <lukasz.m.luki2@gmail.com>
parent a5f2f33a
...@@ -34,7 +34,7 @@ void ff_audio_interleave_close(AVFormatContext *s) ...@@ -34,7 +34,7 @@ void ff_audio_interleave_close(AVFormatContext *s)
AudioInterleaveContext *aic = st->priv_data; AudioInterleaveContext *aic = st->priv_data;
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) 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) ...@@ -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))) { if (c->ast[i] && !(c->audio_data[i]=av_fifo_alloc(100*MAX_AUDIO_FRAME_SIZE))) {
while (i > 0) { while (i > 0) {
i--; i--;
av_fifo_free(c->audio_data[i]); av_fifo_freep(&c->audio_data[i]);
} }
goto bail_out; goto bail_out;
} }
...@@ -350,7 +350,7 @@ static void dv_delete_mux(DVMuxContext *c) ...@@ -350,7 +350,7 @@ static void dv_delete_mux(DVMuxContext *c)
{ {
int i; int i;
for (i=0; i < c->n_ast; 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) static int dv_write_header(AVFormatContext *s)
......
...@@ -1159,7 +1159,7 @@ static int mpeg_mux_end(AVFormatContext *ctx) ...@@ -1159,7 +1159,7 @@ static int mpeg_mux_end(AVFormatContext *ctx)
stream = ctx->streams[i]->priv_data; stream = ctx->streams[i]->priv_data;
assert(av_fifo_size(stream->fifo) == 0); assert(av_fifo_size(stream->fifo) == 0);
av_fifo_free(stream->fifo); av_fifo_freep(&stream->fifo);
} }
return 0; return 0;
} }
......
...@@ -490,8 +490,7 @@ static int swf_write_trailer(AVFormatContext *s) ...@@ -490,8 +490,7 @@ static int swf_write_trailer(AVFormatContext *s)
if (enc->codec_type == AVMEDIA_TYPE_VIDEO) if (enc->codec_type == AVMEDIA_TYPE_VIDEO)
video_enc = enc; video_enc = enc;
else { else {
av_fifo_free(swf->audio_fifo); av_fifo_freep(&swf->audio_fifo);
swf->audio_fifo = NULL;
} }
} }
......
...@@ -761,7 +761,7 @@ static int udp_open(URLContext *h, const char *uri, int flags) ...@@ -761,7 +761,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
fail: fail:
if (udp_fd >= 0) if (udp_fd >= 0)
closesocket(udp_fd); closesocket(udp_fd);
av_fifo_free(s->fifo); av_fifo_freep(&s->fifo);
for (i = 0; i < num_include_sources; i++) for (i = 0; i < num_include_sources; i++)
av_freep(&include_sources[i]); av_freep(&include_sources[i]);
for (i = 0; i < num_exclude_sources; i++) for (i = 0; i < num_exclude_sources; i++)
...@@ -867,7 +867,7 @@ static int udp_close(URLContext *h) ...@@ -867,7 +867,7 @@ static int udp_close(URLContext *h)
pthread_cond_destroy(&s->cond); pthread_cond_destroy(&s->cond);
} }
#endif #endif
av_fifo_free(s->fifo); av_fifo_freep(&s->fifo);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment