Merge proposals dependent on lp:~rexbron/ffmpeg/trunk

lp:~rexbron/ffmpeg/trunk has no merge proposals.