Updating AVOutput for new FFMpeg API (WIP)
Merge branch 'master' into ffmpeg_1_2
Porting back
Version 1.1.3