Merge "CCodec: move Buffers out into a separate file" into qt-dev