Linking notes.
Merge branch 'master' of git://github.com/HalfdanJ/ofxX264

# By Jonas Jongejan
# Via Jonas Jongejan
* 'master' of git://github.com/HalfdanJ/ofxX264:
  Some x264 calls (that don't compile)
Merge branch 'master' of git://github.com/HalfdanJ/ofxX264

# By Jonas Jongejan
# Via Jonas Jongejan
* 'master' of git://github.com/HalfdanJ/ofxX264:
  x264 compiles

Conflicts:
	README.txt
Merge branch 'master' of git://github.com/HalfdanJ/ofxX264

# By Jonas Jongejan
# Via Jonas Jongejan
* 'master' of git://github.com/HalfdanJ/ofxX264:
  starting creating a encoder
  COMPILES
  moved ffmpeg includes and libs to git
Frame for decoder and encoder.