[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 24 17:14:25 2013 +0200| [fe99b1d50ea7bef67fecda10a2b3fa9c1d332814] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cpu: Include common.h for av_popcount64

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

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