Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-mr2 * commit '14f8940472217e8b0164d8f213679710d623d528': Fix media player decode function. Bug 2317821.