har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/h264dsp_armv6.S
View File

@ -236,7 +236,7 @@ function ff_h264_find_start_code_candidate_armv6, export=1
@ drop through to 98f @ drop through to 98f
98: setend le 98: setend le
99: pop {v1-v6,pc} 99: pop {v1-v6,pc}
.endfunc endfunc
.unreq RESULT .unreq RESULT
.unreq BUF .unreq BUF