Merge pull request #195 from antonlacon/ffmpeg-2.3.x