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)
* commit 'e92123093dfdca0ef6608998240e2f9345d63bff':
  mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.

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

Simple merge