Michael Niedermayer 61fbb4cd57 Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba' ...

* commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba':
  avutil: Ensure that emms_c is always defined, even on non-x86
  configure: Move MinGW CPPFLAGS setting to libc section, where it belongs
  avutil: Move emms code to x86-specific header

Conflicts:
	configure
	libavutil/internal.h

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

2013-02-15 12:10:08 +01:00

4.6 KiB

Raw Blame History

View Raw