diff options
author | Stefano Sabatini <stefasab@gmail.com> | 2012-06-28 23:52:28 +0200 |
---|---|---|
committer | Stefano Sabatini <stefasab@gmail.com> | 2012-06-29 13:24:57 +0200 |
commit | 4fd07b9366fb2f74b6af0dea8092d6bafa38f131 (patch) | |
tree | 9d4ae8a7e8dd05f7e96752dbf67050523dd328ff | |
parent | 46747182032af6c3dfeb8a32b7c88cda88bb12be (diff) | |
download | ffmpeg-4fd07b9366fb2f74b6af0dea8092d6bafa38f131.tar.gz |
ffplay: avoid useless NULL checks in swr_free()
swr_free() already checks for nullness, no need to add the check in
calling code.
-rw-r--r-- | ffplay.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1963,8 +1963,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, @@ -2268,8 +2267,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); |