sync to current internal FFMpeg code