Merge commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:49:22 +0000 (12:49 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 3 Oct 2015 10:49:22 +0000 (12:49 +0200)
* commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333':
  dnxhddata: Deduplicate cid 1256 chroma table

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/dnxhddata.c

Simple merge