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)
* qatar/master:
  arm: Use the matching endfunc macro instead of the assembler directive directly

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

Simple merge