Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 19 Dec 2009 15:50:39 +0000 (16:50 +0100)
audiod.c
fecdec_filter.c

index 395a14d..6786eee 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();
 }
 
index 08a0ad0..139a86f 100644 (file)
@@ -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;