FFMPEG revisions to match current CVS (part 1)