aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vc1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-29 00:32:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-29 00:32:14 +0100
commita7f8817720ea04ab9abf16a5b9d493d6a762cd8a (patch)
tree0f9c31741936bbaa3141e857e5e3491142d17417 /libavcodec/vc1.c
parente9a47896a0d1cd8b6577f5a7752e158973d32d2a (diff)
parentb6d5e6aa10a2f09351f287e876f7ed4504e1f75d (diff)
downloadffmpeg-a7f8817720ea04ab9abf16a5b9d493d6a762cd8a.tar.gz
Merge commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d'
* commit 'b6d5e6aa10a2f09351f287e876f7ed4504e1f75d': dca: convert dca_default_coeffs to float. Conflicts: libavcodec/dcadata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
0 files changed, 0 insertions, 0 deletions