[FFmpeg-devel] [PATCH] ffplay: avoid useless NULL checks in swr_free()

Stefano Sabatini stefasab at gmail.com
Fri Jun 29 00:52:44 CEST 2012


swr_free() already checks for nullness, no need to add the check in
calling code.
---
 ffplay.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index d00a0a0..2739f47 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1971,8 +1971,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
                 dec_channel_layout != is->audio_src.channel_layout ||
                 dec->sample_rate   != is->audio_src.freq           ||
                 (wanted_nb_samples != is->frame->nb_samples && !is->swr_ctx)) {
-                if (is->swr_ctx)
-                    swr_free(&is->swr_ctx);
+                swr_free(&is->swr_ctx);
                 is->swr_ctx = swr_alloc_set_opts(NULL,
                                                  is->audio_tgt.channel_layout, is->audio_tgt.fmt, is->audio_tgt.freq,
                                                  dec_channel_layout,           dec->sample_fmt,   dec->sample_rate,
@@ -2272,8 +2271,7 @@ static void stream_component_close(VideoState *is, int stream_index)
 
         packet_queue_flush(&is->audioq);
         av_free_packet(&is->audio_pkt);
-        if (is->swr_ctx)
-            swr_free(&is->swr_ctx);
+        swr_free(&is->swr_ctx);
         av_freep(&is->audio_buf1);
         is->audio_buf = NULL;
         av_freep(&is->frame);
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list