[FFmpeg-cvslog] Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 13:10:53 2013 +0200| [9d47333e3eee1d9a31a98ebf67338463943846dc] | committer: Michael Niedermayer

Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'

* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
  mlpdsp: x86: Respect cpuflags

Conflicts:
	libavcodec/x86/mlpdsp.c

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

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