mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-05-02 14:48:22 +00:00
[mod_av] Fix dead nested assignments
This commit is contained in:
parent
f3c7c4d445
commit
cd86de2f1f
@ -742,7 +742,7 @@ GCC_DIAG_ON(deprecated-declarations)
|
|||||||
av_opt_set_int(mst->resample_ctx, "out_sample_fmt", c->sample_fmt, 0);
|
av_opt_set_int(mst->resample_ctx, "out_sample_fmt", c->sample_fmt, 0);
|
||||||
av_opt_set_int(mst->resample_ctx, "out_channel_layout", c->channel_layout, 0);
|
av_opt_set_int(mst->resample_ctx, "out_channel_layout", c->channel_layout, 0);
|
||||||
|
|
||||||
if ((ret = swr_init(mst->resample_ctx)) < 0) {
|
if (swr_init(mst->resample_ctx) < 0) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to initialize the resampling context\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to initialize the resampling context\n");
|
||||||
av_free(mst->resample_ctx);
|
av_free(mst->resample_ctx);
|
||||||
mst->resample_ctx = NULL;
|
mst->resample_ctx = NULL;
|
||||||
@ -2003,7 +2003,6 @@ static switch_status_t av_file_truncate(switch_file_handle_t *handle, int64_t of
|
|||||||
|
|
||||||
static switch_status_t av_file_write(switch_file_handle_t *handle, void *data, size_t *len)
|
static switch_status_t av_file_write(switch_file_handle_t *handle, void *data, size_t *len)
|
||||||
{
|
{
|
||||||
|
|
||||||
uint32_t datalen = 0;
|
uint32_t datalen = 0;
|
||||||
switch_status_t status = SWITCH_STATUS_SUCCESS;
|
switch_status_t status = SWITCH_STATUS_SUCCESS;
|
||||||
// uint8_t buf[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 }, *bp = buf;
|
// uint8_t buf[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 }, *bp = buf;
|
||||||
@ -2095,7 +2094,7 @@ GCC_DIAG_ON(deprecated-declarations)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
while ((inuse = switch_buffer_inuse(context->audio_buffer)) >= bytes) {
|
while (switch_buffer_inuse(context->audio_buffer) >= bytes) {
|
||||||
AVPacket pkt[2] = { {0} };
|
AVPacket pkt[2] = { {0} };
|
||||||
int got_packet[2] = {0};
|
int got_packet[2] = {0};
|
||||||
int j = 0, ret = -1, audio_stream_count = 1;
|
int j = 0, ret = -1, audio_stream_count = 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user