[FFmpeg-cvslog] Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  9 11:51:21 2013 +0200| [696f5f98e282ad74604ae85661c19ed599c32d81] | committer: Michael Niedermayer

Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'

* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
  x86: vf_yadif: Remove stray dsputil_mmx #include

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

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