diff options
| author | John Morrison <jcm357@cs.drexel.edu> | 2012-06-15 13:53:41 -0400 |
|---|---|---|
| committer | John Morrison <jcm357@cs.drexel.edu> | 2012-06-15 13:53:41 -0400 |
| commit | 1698e35b54c109742a949f6e36a45dd74967bbce (patch) | |
| tree | b59678d27cff144476e2e39b386fb9dbe8bc93f8 | |
| parent | f5743a45d8aa7ef1d51719e5b8bfaa9d73bd72f5 (diff) | |
| parent | e32d9f1b9140e88959325c279c2ab5f0c65aadc4 (diff) | |
Merge branch 'master' of git@github.com:mutantturkey/FlyTracking
| -rwxr-xr-x | process-video-beta | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/process-video-beta b/process-video-beta index 1e43dab..97aeffa 100755 --- a/process-video-beta +++ b/process-video-beta @@ -171,7 +171,7 @@ if [[ $stage_1 -eq 1 ]]; then echo "$crop_list" echo "$set_list" - parallel -v --progress --xapply -j 1 -S $server_list mplayer -quiet -vo png:prefix={1}"_":outdir=$output_dir/Cropped/{1} -nosound -vf crop={2} -speed 12 $video_file ::: $set_list ::: $crop_list + parallel -v --progress --xapply -S $server_list mplayer -quiet -vo png:prefix={1}"_":outdir=$output_dir/Cropped/{1} -nosound -vf crop={2} -speed 12 $video_file ::: $set_list ::: $crop_list fi |