diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:39:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-30 06:46:08 +0200 |
| commit | faba79e0800ded6285e2cf75622fa42077e781f4 (patch) | |
| tree | cc57a187242b52fcde696caf65571b411ab5d392 /libavcodec/x86/h264_i386.h | |
| parent | d9c23a0d5a56488b146eef17a19a9b47643be333 (diff) | |
| parent | 1f6f58d5855288492fc2640a9f1035c01c75d356 (diff) | |
| download | ffmpeg-faba79e0800ded6285e2cf75622fa42077e781f4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_i386.h')
| -rw-r--r-- | libavcodec/x86/h264_i386.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/h264_i386.h b/libavcodec/x86/h264_i386.h index 38908a42e2..8ea430a82a 100644 --- a/libavcodec/x86/h264_i386.h +++ b/libavcodec/x86/h264_i386.h @@ -67,7 +67,7 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, "test $1, %4 \n\t" " jnz 4f \n\t" - "add $4, %2 \n\t" + "add"OPSIZE" $4, %2 \n\t" "3: \n\t" "add $1, %1 \n\t" @@ -125,7 +125,7 @@ static int decode_significance_8x8_x86(CABACContext *c, "test $1, %4 \n\t" " jnz 4f \n\t" - "add $4, %2 \n\t" + "add"OPSIZE" $4, %2 \n\t" "3: \n\t" "addl $1, %k6 \n\t" |