merge media InputStream changes from MIR_1_0 branch