Commit 4fd07b93 authored by Stefano Sabatini's avatar Stefano Sabatini

ffplay: avoid useless NULL checks in swr_free()

swr_free() already checks for nullness, no need to add the check in
calling code.
parent 46747182
...@@ -1963,8 +1963,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr) ...@@ -1963,8 +1963,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
dec_channel_layout != is->audio_src.channel_layout || dec_channel_layout != is->audio_src.channel_layout ||
dec->sample_rate != is->audio_src.freq || dec->sample_rate != is->audio_src.freq ||
(wanted_nb_samples != is->frame->nb_samples && !is->swr_ctx)) { (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->swr_ctx = swr_alloc_set_opts(NULL,
is->audio_tgt.channel_layout, is->audio_tgt.fmt, is->audio_tgt.freq, is->audio_tgt.channel_layout, is->audio_tgt.fmt, is->audio_tgt.freq,
dec_channel_layout, dec->sample_fmt, dec->sample_rate, dec_channel_layout, dec->sample_fmt, dec->sample_rate,
...@@ -2268,8 +2267,7 @@ static void stream_component_close(VideoState *is, int stream_index) ...@@ -2268,8 +2267,7 @@ static void stream_component_close(VideoState *is, int stream_index)
packet_queue_flush(&is->audioq); packet_queue_flush(&is->audioq);
av_free_packet(&is->audio_pkt); 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); av_freep(&is->audio_buf1);
is->audio_buf = NULL; is->audio_buf = NULL;
av_freep(&is->frame); av_freep(&is->frame);
......
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