Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 09:14:10 +0000 (11:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 09:21:45 +0000 (11:21 +0200)
commit1a7ae6be2a8722d0a496acb11963e9540d7494d3
tree39a2f629f1159c1639d8b25e6e6cace7a952c0db
parente119d1b345c1673f83f36050fc706233b1934ffe
parent86113667c0fc6cded65b94fb57262da09c06594b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Include hpeldsp_neon.o if h264qpel is enabled

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