Make room for FFmpeg 2.0