Merge branch 'ffmpeg-2.0.2-support'
Merge branch 'ffmpeg-2.0.2-support'
add support for ffmpeg version 2.1.1
Merge pull request #18 from mbkulik/ffmpeg-2.1.1-support

Ffmpeg 2.1.1 support