[FFmpeg-cvslog] Merge commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 12:49:22 2015 +0200| [6b849211bc2a5499612fc8a27e4700184a61f7f7] | committer: Hendrik Leppkes

Merge commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333'

* commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333':
  dnxhddata: Deduplicate cid 1256 chroma table

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

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