- upstream fix for ffmpeg 2.2
- rel 3