diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:24:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:24:15 +0200 |
| commit | 0dd25e46996d648a7718c32e91cb5985b333963f (patch) | |
| tree | 35f433eb9cc11f59179ddc55690f8048c4c1b1a9 /libavcodec/x86/h264_qpel.c | |
| parent | 0e3d2b2c8d027182dfcd82cde8c986d8aab7add7 (diff) | |
| parent | b71a0507b01efdb5f783419df5e22e29678dc049 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Remove unused inline asm instruction defines
vc1: Remove now unused variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_qpel.c')
| -rw-r--r-- | libavcodec/x86/h264_qpel.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 28aa57d889..85f1420d37 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -391,8 +391,6 @@ QPEL(put_, 16,XMM, 16)\ QPEL(avg_, 8, XMM, 16)\ QPEL(avg_, 16,XMM, 16)\ -#undef PAVGB -#define PAVGB "pavgb" QPEL_H264(put_, PUT_OP, mmxext) QPEL_H264(avg_, AVG_MMXEXT_OP, mmxext) QPEL_H264_V_XMM(put_, PUT_OP, sse2) @@ -403,7 +401,6 @@ QPEL_H264_H_XMM(put_, PUT_OP, ssse3) QPEL_H264_H_XMM(avg_,AVG_MMXEXT_OP, ssse3) QPEL_H264_HV_XMM(put_, PUT_OP, ssse3) QPEL_H264_HV_XMM(avg_,AVG_MMXEXT_OP, ssse3) -#undef PAVGB H264_MC_4816(mmxext) H264_MC_816(H264_MC_V, sse2) |