Merge proposals dependent on lp://qastaging/~guijemont/oabuild/ffmpeg_r15750

lp://qastaging/~guijemont/oabuild/ffmpeg_r15750 has no merge proposals.