Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 12:19:46 +0000 (13:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 12:19:54 +0000 (13:19 +0100)
commitd8e65e9224b9234e3b0baaa916bc9c9bdbb34eb6
tree6cc7cb4c8d70f88b58e96cdcfb732cabd98c0a16
parent63ce041a7d06d9b411ab148289e1af9a407dfaea
parent3348e3492d0cf605361bacce28b3ddb02e1b563f
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@gmx.at>
libavcodec/arm/h264dsp_armv6.S