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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 26 16:55:46 2014 +0100| [4998a72b497fd4b658887aebb3a2240aefe1fc81] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init

Conflicts:
	libavcodec/x86/rnd_mmx.c

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

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