[FFmpeg-cvslog] Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 13:03:42 2014 +0200| [118d84b7e937bdffba91a8879cdf92df93285aa6] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=118d84b7e937bdffba91a8879cdf92df93285aa6
---