javadoc updates and ffmpeg 2.1.1 codec update