diff --git a/mj2/mj2.c b/mj2/mj2.c
index 33b970c8..9880e979 100644
--- a/mj2/mj2.c
+++ b/mj2/mj2.c
@@ -181,6 +181,9 @@ int mj2_init_stdmovie(mj2_movie_t * movie)
   for (i = 0; i < movie->num_htk + movie->num_stk + movie->num_vtk; i++) {
     mj2_tk_t *tk = &movie->tk[i];
     movie->next_tk_id++;
+    tk->jp2_struct.comps = NULL;
+    tk->jp2_struct.cl = NULL;
+    
     if (tk->track_type == 0) {
       if (tk->num_samples == 0)
 	return 1;
@@ -256,6 +259,10 @@ int mj2_init_stdmovie(mj2_movie_t * movie)
       tk->visual_w = tk->w << 16;
       tk->visual_h = tk->h << 16;
     }
+    else {
+      tk->num_br = 0;
+      tk->jp2xdata = NULL;
+    }
   }
   return 0;
 }