diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:03:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:03:37 +0100 |
| commit | 5cc30e0f603a030b97b7be37a7aa5d22d13f7a07 (patch) | |
| tree | 01875b465e2f7749cc8f87f1df756b2cb2ca2596 /media/ffvpx/libavcodec/x86/h264_i386.h | |
| parent | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (diff) | |
| parent | 30bfbb3f97bd64b7838bcb55c98fa698b1bcc9d2 (diff) | |
| download | UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.gz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.lz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.tar.xz UXP-5cc30e0f603a030b97b7be37a7aa5d22d13f7a07.zip | |
Merge pull request #10 from trav90/media-work
Update FFmpeg code to n3.2-65-gee56777
Diffstat (limited to 'media/ffvpx/libavcodec/x86/h264_i386.h')
| -rw-r--r-- | media/ffvpx/libavcodec/x86/h264_i386.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/ffvpx/libavcodec/x86/h264_i386.h b/media/ffvpx/libavcodec/x86/h264_i386.h index 4dfbc3093..19cd12838 100644 --- a/media/ffvpx/libavcodec/x86/h264_i386.h +++ b/media/ffvpx/libavcodec/x86/h264_i386.h @@ -91,13 +91,13 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, "sub %10, %1 \n\t" "mov %2, %0 \n\t" "movl %7, %%ecx \n\t" - "add %1, %%"REG_c" \n\t" + "add %1, %%"FF_REG_c" \n\t" "movl %%ecx, (%0) \n\t" "test $1, %4 \n\t" " jnz 5f \n\t" - "add"OPSIZE" $4, %2 \n\t" + "add"FF_OPSIZE" $4, %2 \n\t" "4: \n\t" "add $1, %1 \n\t" @@ -105,7 +105,7 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, " jb 3b \n\t" "mov %2, %0 \n\t" "movl %7, %%ecx \n\t" - "add %1, %%"REG_c" \n\t" + "add %1, %%"FF_REG_c" \n\t" "movl %%ecx, (%0) \n\t" "5: \n\t" "add %9, %k0 \n\t" @@ -116,7 +116,7 @@ static int decode_significance_x86(CABACContext *c, int max_coeff, "i"(offsetof(CABACContext, bytestream)), "i"(offsetof(CABACContext, bytestream_end)) TABLES_ARG - : "%"REG_c, "memory" + : "%"FF_REG_c, "memory" ); return coeff_count; } @@ -183,7 +183,7 @@ static int decode_significance_8x8_x86(CABACContext *c, "test $1, %4 \n\t" " jnz 5f \n\t" - "add"OPSIZE" $4, %2 \n\t" + "add"FF_OPSIZE" $4, %2 \n\t" "4: \n\t" "add $1, %6 \n\t" @@ -202,7 +202,7 @@ static int decode_significance_8x8_x86(CABACContext *c, "i"(offsetof(CABACContext, bytestream)), "i"(offsetof(CABACContext, bytestream_end)), "i"(H264_LAST_COEFF_FLAG_OFFSET_8x8_OFFSET) TABLES_ARG - : "%"REG_c, "memory" + : "%"FF_REG_c, "memory" ); return coeff_count; } |