Skip to content
Snippets Groups Projects
Commit f67ec7f3 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '0eeeb964' 


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

Conflicts:
	libavcodec/Makefile

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ceaaf0d9 0eeeb964
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment