Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:17:37 +0000 (09:17 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:17:37 +0000 (09:17 +0200)
commitbd074bde02aa11b93958300f06be2a18b549091a
tree819dd7b5b114bb475ec507487ba292f9cdc63fbc
parent81a8701eb52d2b6469ae16ef442ce425388141b7
parentfdd021884d5c06fb9ad65cb0040bb5717a7b084b
Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'

* commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b':
  dnxhddata: Keep a single CID in the table names

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