update for FFmpeg 2.1.5