[FFmpeg-cvslog] Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  8 05:21:10 2014 +0100| [3c00d4c5f0ae855981a0cf8addfae0c948414625] | committer: Michael Niedermayer

Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c00d4c5f0ae855981a0cf8addfae0c948414625
---