Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Feb 2013 11:10:08 +0000 (12:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Feb 2013 11:10:08 +0000 (12:10 +0100)
commit61fbb4cd57d7bd280c6645df98acdacfe6004a88
tree52c35fd93bdfc3b30d6b284e59e9362131b49962
parent75758f84def252a228a80a2e08d0c9ed7fce8df4
parent4db96649ca700db563d9da4ebe70bf9fc4c7a6ba
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>
configure
libavutil/internal.h
libavutil/x86/emms.h