Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:21:10 +0000 (05:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:21:18 +0000 (05:21 +0100)
commit3c00d4c5f0ae855981a0cf8addfae0c948414625
tree2ed15013f314aebe48fed2700234f2a1f89329af
parent9ef7c0c5510fb79c44291cc57c490fbb7f70f998
parentb7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0
Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'

* commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0':
  arm: Remove a leftover define for the pld instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/dsputil_arm.S