Michael Niedermayer 4998a72b49 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@gmx.at>

2014-03-26 16:55:46 +01:00

12 KiB

Raw Blame History

View Raw