- fix build with ffmpeg2
- rel 7