OSDN Git Service

Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 23:32:14 +0000 (00:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 23:32:14 +0000 (00:32 +0100)
commita7f8817720ea04ab9abf16a5b9d493d6a762cd8a
tree0f9c31741936bbaa3141e857e5e3491142d17417
parente9a47896a0d1cd8b6577f5a7752e158973d32d2a
parentb6d5e6aa10a2f09351f287e876f7ed4504e1f75d
Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'

* commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d':
  dca: convert dca_default_coeffs to float.

Conflicts:
libavcodec/dcadata.h

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