[FFmpeg-cvslog] Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 25 14:14:21 2013 +0100| [e9125dd5563484a067ef75b6fce4fbef235c5c6e] | committer: Michael Niedermayer

Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'

* commit '2c10e2a2f62477efaef5b641974594f7df4ca339':
  build: Make the H.264 parser select h264qpel
  x86: h264qpel: add cpu flag checks for init function

Conflicts:
	libavcodec/x86/h264_qpel.c

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

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