[#3224] Use buffer for media clips