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>
11 years ago · d8e65e9224
parent 63ce041a7d 3348e3492d
commit d8e65e9224
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/arm/h264dsp_armv6.S
+++ b/libavcodec/arm/h264dsp_armv6.S
@ -236,7 +236,7 @@ function ff_h264_find_start_code_candidate_armv6, export=1
        @ drop through to 98f
 98:     setend  le
 99:     pop     {v1-v6,pc}
-.endfunc
+endfunc

        .unreq  RESULT
        .unreq  BUF