Merge branch 'master' into next

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 21f4cb4de07706f53591b3e7161f8c22a570ff24..269c0e0c4ac2d8ff1ed4c329db168fa26f869671 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -338,8 +338,6 @@ static int setup_next_fec_group(struct fec_client *fc, struct vss_task *vsst)
        /* setup group timing */
        tv_scale(g->first_chunk - fc->first_stream_chunk, chunk_tv, &tmp);
        tv_add(&fc->stream_start, &tmp, &g->start);
-       if (g->num) /* quick hack to avoid buffer underruns */
-               g->start.tv_sec--;
        tv_scale(g->num_chunks, chunk_tv, &tmp); /* group duration */
        tv_divide(fc->fcp->slices_per_group + fc->num_extra_slices,
                &tmp, &g->slice_duration);