[FFmpeg-cvslog] Merge commit 'cc320296ab438dfe3178f0e1f775af955fe6c064'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 12:47:35 2015 +0200| [092d22ea755a6fb100dfcc286a75e56ba9acec51] | committer: Hendrik Leppkes

Merge commit 'cc320296ab438dfe3178f0e1f775af955fe6c064'

* commit 'cc320296ab438dfe3178f0e1f775af955fe6c064':
  dnxhddata: Fix cid 1260 luma and chroma tables

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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