[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 13:19:46 2014 +0100| [d8e65e9224b9234e3b0baaa916bc9c9bdbb34eb6] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Use the matching endfunc macro instead of the assembler directive directly

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

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