Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 11:03:42 +0000 (13:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 11:06:09 +0000 (13:06 +0200)
commit118d84b7e937bdffba91a8879cdf92df93285aa6
treeb3743f46549c492f6f3cfd8e0f2a602e4050bb35
parent40c9d43086890df11389ceefd88f517471e41202
parentf2ce63246f5c934429f9cb857a794e07624d7912
Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'

* commit 'f2ce63246f5c934429f9cb857a794e07624d7912':
  dcadec: replace ldexpf with a multiplication by a constant

Conflicts:
libavcodec/dcadec.c

See: 6da06ef6bbc01b713f67ffb94e7697eb2393ebe4
See: 9ccb5455ca8c63eb330abd3c2ed6a9b0ae3b755e
See: 6b88f22e895314164eef00ccbdbf11ad97a7c56f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadec.c