Merge pull request #101 from twolife/master

fix build against ffmpeg >= 1.0