Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:58:49 +0000 (22:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 22:00:22 +0000 (23:00 +0100)
commit85b424a45e3846bf48b8e53bc107bb4ead8216c6
tree6f2f60a51a0a8bad88acb91c0108ca077f1f23f2
parentb4107f7805be6699d4b38449b1f9235958a2a133
parente92123093dfdca0ef6608998240e2f9345d63bff
Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'

* commit 'e92123093dfdca0ef6608998240e2f9345d63bff':
  mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mlpdec.c