1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

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>
This commit is contained in:
Michael Niedermayer 2014-01-04 13:19:46 +01:00
commit d8e65e9224

View File

@ -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