diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 12:13:22 +0200 |
| commit | 15141f939dc725451644869f4d413adb46927677 (patch) | |
| tree | e0aba01c6ebbe093e4b3265ae94f639628c1053f /libavcodec/x86 | |
| parent | 68ca49dc7256bbe413ce29fa3fc47bb4143304c0 (diff) | |
| parent | 8b84e082ed27fb635fca524fbd14b1db094ee8b0 (diff) | |
| download | ffmpeg-15141f939dc725451644869f4d413adb46927677.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: add parens around some macro arguments
h264: use proper PROLOGUE statement for a function using 8 registers.
doc: Update sample Vim config with suitable (function) indentation settings.
dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
dv: Move static tables only used in one place to where they are used.
graphparser: set next to NULL on an entry extracted from inputs list
doc/filters: update documentation.
avconv: flush decoders immediately after an EOF.
avconv: send EOF to vsrc_buffer.
avconv: reindent.
Conflicts:
doc/filters.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/h264_weight_10bit.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/h264_weight_10bit.asm b/libavcodec/x86/h264_weight_10bit.asm index c4b12984f6..dec9aba461 100644 --- a/libavcodec/x86/h264_weight_10bit.asm +++ b/libavcodec/x86/h264_weight_10bit.asm @@ -160,7 +160,7 @@ DECLARE_REG_TMP 7 %macro BIWEIGHT_PROLOGUE 0 .prologue - PROLOGUE 0,7,8 + PROLOGUE 0,8,8 movifnidn r0, r0mp movifnidn r1, r1mp movifnidn r2d, r2m @@ -218,7 +218,7 @@ DECLARE_REG_TMP 7 %endmacro %macro BIWEIGHT_FUNC_DBL 1 -cglobal h264_biweight_16_10_%1, 0, 8, 8 +cglobal h264_biweight_16_10_%1 BIWEIGHT_PROLOGUE BIWEIGHT_SETUP %1 .nextrow @@ -238,7 +238,7 @@ BIWEIGHT_FUNC_DBL sse2 BIWEIGHT_FUNC_DBL sse4 %macro BIWEIGHT_FUNC 1 -cglobal h264_biweight_8_10_%1, 0, 8, 8 +cglobal h264_biweight_8_10_%1 BIWEIGHT_PROLOGUE BIWEIGHT_SETUP %1 .nextrow @@ -256,7 +256,7 @@ BIWEIGHT_FUNC sse2 BIWEIGHT_FUNC sse4 %macro BIWEIGHT_FUNC_HALF 1 -cglobal h264_biweight_4_10_%1, 0, 8, 8 +cglobal h264_biweight_4_10_%1 BIWEIGHT_PROLOGUE BIWEIGHT_SETUP %1 sar r3d, 1 |