reverted some of 4.0 api changes, so our ffmpeg patch for this probably not needed anymore if we decide to update. Memleak fixes also.