8bc1800dba
Merge commit 'f63779b392275265b3b13728c78a0a5f4ac10c01' * commit 'f63779b392275265b3b13728c78a0a5f4ac10c01': Fix media player decode function. Bug 2317821.