Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 04:12:07 +0000 (05:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Nov 2013 04:12:07 +0000 (05:12 +0100)
commitf67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7
tree46cf8165c145f437a19140a22ddf7f1d0a80cefc
parentceaaf0d97e7fc11b850325201cf30d7b83e80fd2
parent0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85
Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'

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

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/mpegaudiodec_fixed.c
libavcodec/mpegaudiodec_float.c
libavcodec/mpegaudiodec_template.c