Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:27:02 +0000 (09:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:27:02 +0000 (09:27 +0200)
commit305f46175429ed4f19f5a5bc6c1ca07498c4f26c
tree7fad1472a6b7f321aef4d73afd4508e5f280432b
parent3b0af76c1b43077edf5503f5b19a2abc18fa6842
parent403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1
Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'

* commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1':
  dnxhddata: Merge a few duplicated DC tables

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