[FFmpeg-cvslog] Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  5 22:34:15 2014 +0100| [ae01af24756d6f5bd13eef405ca19a8bf458b39f] | committer: Michael Niedermayer

Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'

* commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7':
  dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae01af24756d6f5bd13eef405ca19a8bf458b39f
---