[FFmpeg-cvslog] Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 24 05:12:07 2013 +0100| [f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7] | committer: Michael Niedermayer

Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'

* commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85':
  mpegaudiodec: Consistently handle fixed/float templating

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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