diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 13:19:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 13:19:54 +0100 |
| commit | d8e65e9224b9234e3b0baaa916bc9c9bdbb34eb6 (patch) | |
| tree | 6cc7cb4c8d70f88b58e96cdcfb732cabd98c0a16 | |
| parent | 63ce041a7d06d9b411ab148289e1af9a407dfaea (diff) | |
| parent | 3348e3492d0cf605361bacce28b3ddb02e1b563f (diff) | |
| download | ffmpeg-d8e65e9224b9234e3b0baaa916bc9c9bdbb34eb6.tar.gz | |
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>
| -rw-r--r-- | libavcodec/arm/h264dsp_armv6.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/h264dsp_armv6.S b/libavcodec/arm/h264dsp_armv6.S index 93dc69b77a..2758262c84 100644 --- 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 |