@@ -487,7 +487,7 @@ def merge_datasets(config,forceiterate=None):
     config_path = Path(config).parents[0]
 
     bf=Path(str(config_path/'labeled-data'))
-    allfolders = [os.path.join(bf,fn) for fn in os.listdir(bf) ]
+    allfolders = [os.path.join(bf,fn) for fn in os.listdir(bf) and "_labeled" not in fn] #exclude labeled data folders!
     flagged=False
     for findex,folder in enumerate(allfolders): 
         if os.path.isfile(os.path.join(folder,'MachineLabelsRefine.h5')): #Folder that was manually refine...
 
@@ -147,7 +147,7 @@ def CreateVideoSlow(clip,Dataframe,tmpfolder,dotsize,colormap,alphavalue,pcutoff
             os.remove(file_name)
     os.chdir(start)
 
-def create_labeled_video(config,videos,shuffle=1,trainingsetindex=0,videotype='avi',save_frames=False,delete=False,displayedbodyparts='all',codec='X264'):
+def create_labeled_video(config,videos,shuffle=1,trainingsetindex=0,videotype='avi',save_frames=False,delete=False,displayedbodyparts='all',codec='avc1'):
     """
     Labels the bodyparts in a video. Make sure the video is already analyzed by the function 'analyze_video'