diff options
author | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-05-06 23:48:14 +0400 |
---|---|---|
committer | Lukasz Marek <lukasz.m.luki2@gmail.com> | 2014-05-08 01:39:47 +0400 |
commit | ce1eefe691ef52539adb8f4991092f181a17370d (patch) | |
tree | fe67c4acbfe1b78ec0bf4224bc2ca58cb3dadb1e /libavformat | |
parent | a5f2f33a679421506a7e1755e82edaebc63f3588 (diff) |
lavf: use av_fifo_freep
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/audiointerleave.c | 2 | ||||
-rw-r--r-- | libavformat/dvenc.c | 4 | ||||
-rw-r--r-- | libavformat/mpegenc.c | 2 | ||||
-rw-r--r-- | libavformat/swfenc.c | 3 | ||||
-rw-r--r-- | libavformat/udp.c | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index 2aa95f3dc6..6d24ff5c7f 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.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); } } diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 43f65c37b9..defcf2a16e 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -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) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 1e60c51fdd..5521f48cee 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -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; } diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 8d9cf0c246..402f21ef40 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -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); } } diff --git a/libavformat/udp.c b/libavformat/udp.c index d9a18d5739..65c7a5549d 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -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; } |