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
..
2014-03-17 00:48:09 +01:00
2014-02-24 08:30:19 +01:00
2014-03-25 13:29:05 +01:00
2014-03-22 14:07:03 +01:00
2014-03-25 13:29:29 +01:00
2014-02-17 13:39:00 +01:00