Merge branch 'maint'

diff --git a/audiod.c b/audiod.c
index 395a14d3c582e63480b677840dca6aafb5b5f111..6786eeef069921ae78118540af58501d7dbbad99 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -937,6 +937,7 @@ static void close_stat_pipe(void)
        stat_task->length_seconds = 0;
        stat_task->offset_seconds = 0;
        stat_task->vss_status = 0;
+       stat_task->current_audio_format_num = -1;
        audiod_status_dump();
 }
 

diff --git a/fecdec_filter.c b/fecdec_filter.c
index 08a0ad0b19befe22befbff26112358b9c6685093..139a86fa1b7bf69ff832ca7a3fac755b68de5304 100644 (file)
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -110,7 +110,9 @@ static void clear_group(struct fecdec_group *fg)
                fg->idx[i] = -1;
        }
        free(fg->data);
+       fg->data = NULL;
        free(fg->idx);
+       fg->idx = NULL;
        fg->num_slices = 0;
        memset(&fg->h, 0, sizeof(struct fec_header));
        fg->num_received_slices = 0;