Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 15:55:46 +0000 (16:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 15:55:46 +0000 (16:55 +0100)
commit4998a72b497fd4b658887aebb3a2240aefe1fc81
tree66518825972a9eb6227ab2da22878933e32fb148
parentb7f0d39d2629f0a1854adbda74c434a0754e9fa1
parentefc7290eb668ce77ef28d0ab9958024d0a35fbe8
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>
libavcodec/x86/Makefile
libavcodec/x86/hpeldsp_init.c