Ffmpeg 2.1.1 support

built and tested on OSX 10.8 with 1.9.3-p484 and 2.0.0-p353