[FFmpeg-cvslog] Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 15 12:10:08 2013 +0100| [61fbb4cd57d7bd280c6645df98acdacfe6004a88] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61fbb4cd57d7bd280c6645df98acdacfe6004a88
---