Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 17:01:12 +0000 (19:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 May 2014 17:01:12 +0000 (19:01 +0200)
commitc867be03f61ebce3b87033137d0012a660b8ff75
tree0d09d51860def1ceab2bb087ac60af2604aa02cd
parent6a4832caaede15e3d918b1408ff83fe30324507b
parent6b7b8585d73548f08b98959df39d80b97677662f
Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'

* commit '6b7b8585d73548f08b98959df39d80b97677662f':
  dca: Convert dca_dmixtable to integers

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadata.h
libavcodec/dcadec.c