Multimedia: Improved the bufferring logic
Merge pull request #4041 from LaurentGoderre/fix-multimedia

Multimedia: Improved the bufferring logic