1.1 --- a/org/gabor.org	Sun Mar 10 18:17:53 2013 +0000
     1.2 +++ b/org/gabor.org	Tue Mar 12 03:54:19 2013 +0000
     1.3 @@ -423,29 +423,28 @@
     1.4        
     1.5  #+end_src
     1.6  
     1.7 -#+name: make-left-right
     1.8 -#+begin_src sh
     1.9 -#!/bin/sh
    1.10  
    1.11 -ffmpeg -framerate 60 -i ./left-right/%07d.png -b:v 9000k\
    1.12 -     -c:v mpeg4 -r 60 gabor-rotation.mp4
    1.13 +#+name: make-videos
    1.14 +#+begin_src makefile
    1.15 +scale: 
    1.16 +	ffmpeg -framerate 60 -i ./big-small/%07d.png -b:v 9000k\
    1.17 +            -c:v theora -r 60 gabor-scale.ogg
    1.18  
    1.19 +rotation: 
    1.20 +	ffmpeg -framerate 60 -i ./left-right/%07d.png -b:v 9000k\
    1.21 +            -c:v theora -r 60 gabor-rotation.ogg
    1.22 +
    1.23 +all: rotation scale
    1.24 +
    1.25 +clean: 
    1.26 +	rm gabor-rotation.org gabor-scale.ogg
    1.27  #+end_src
    1.28  
    1.29  
    1.30 -#+name: make-big-small
    1.31 -#+begin_src sh
    1.32 -#!/bin/sh
    1.33 -
    1.34 -ffmpeg -framerate 60 -i ./big-small/%07d.png -b:v 9000k\
    1.35 -     -c:v mpeg4 -r 60 gabor-big-small.mp4
    1.36 -
    1.37 -#+end_src
    1.38 -
    1.39  #+begin_html
    1.40  <div class="figure">
    1.41 -<video controls="controls" width="755">
    1.42 -  <source src="../video/gabor-rotation.mp4" type="video/mp4"
    1.43 +<video controls="controls">
    1.44 +  <source src="../video/gabor-rotation.mp4" type="video/ogg"
    1.45  	  preload="none" poster="../images/aurellem-1280x480.png" />
    1.46  </video>
    1.47   <br> <a href="http://youtu.be/bxujjO97B-U"> YouTube </a>
    1.48 @@ -458,8 +457,8 @@
    1.49  
    1.50  #+begin_html
    1.51  <div class="figure">
    1.52 -<video controls="controls" width="755">
    1.53 -  <source src="../video/gabor-big-small.mp4" type="video/mp4"
    1.54 +<video controls="controls">
    1.55 +  <source src="../video/gabor-scale.ogg" type="video/ogg"
    1.56  	  preload="none" poster="../images/aurellem-1280x480.png" />
    1.57  </video>
    1.58   <br> <a href="http://youtu.be/-EsfA2ceWUk"> YouTube </a>
    1.59 @@ -469,17 +468,12 @@
    1.60  
    1.61  
    1.62  
    1.63 -
    1.64  * COMMENT Generate Source
    1.65  #+begin_src clojure :tangle ../src/cortex/gabor.clj
    1.66  <<gabor>>
    1.67  <<gabor-tail>>
    1.68  #+end_src
    1.69  
    1.70 -#+begin_src clojure :tangle ../render/gabor-1/make-rotation.sh
    1.71 -<<make-left-right>>
    1.72 -#+end_src
    1.73 -
    1.74 -#+begin_src clojure :tangle ../render/gabor-1/make-big-small.sh
    1.75 -<<make-big-small>>
    1.76 -#+end_src
    1.77 +#+begin_src Makefile :tangle ../render/gabor-1/Makefile
    1.78 +<<make-videos>>
    1.79 +#+end_src
    1.80 \ No newline at end of file