Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:34:15 +0000 (22:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:34:21 +0000 (22:34 +0100)
* commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7':
  dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.

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

Simple merge