-
Michael Niedermayer authored
* commit '0eeeb964': mpegaudiodec: Consistently handle fixed/float templating Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
f67ec7f3
* commit '0eeeb964': mpegaudiodec: Consistently handle fixed/float templating Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>