diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-09-01 10:59:16 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-09-01 10:59:16 +0200 |
| commit | a26789cf9f8000a040a4f4481e0f3552cf63dc68 (patch) | |
| tree | ddbaa9b84e427c4538745673c3755b05e3ef6e3d /libavcodec/x86/h264_intrapred_init.c | |
| parent | d55252c33156a53dae8e1beba73b163724dec8cf (diff) | |
| download | ffmpeg-a26789cf9f8000a040a4f4481e0f3552cf63dc68.tar.gz | |
Fix compilation with yasm-0.6.2.
Diffstat (limited to 'libavcodec/x86/h264_intrapred_init.c')
| -rw-r--r-- | libavcodec/x86/h264_intrapred_init.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/x86/h264_intrapred_init.c b/libavcodec/x86/h264_intrapred_init.c index 3d4701df2e..d40a08a6bb 100644 --- a/libavcodec/x86/h264_intrapred_init.c +++ b/libavcodec/x86/h264_intrapred_init.c @@ -367,8 +367,7 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth h->pred8x8l[VERT_RIGHT_PRED ] = ff_pred8x8l_vertical_right_10_ssse3; h->pred8x8l[HOR_UP_PRED ] = ff_pred8x8l_horizontal_up_10_ssse3; } -#if HAVE_AVX - if (mm_flags & AV_CPU_FLAG_AVX) { + if (HAVE_AVX_EXTERNAL && mm_flags & AV_CPU_FLAG_AVX) { h->pred4x4[DIAG_DOWN_LEFT_PRED ] = ff_pred4x4_down_left_10_avx; h->pred4x4[DIAG_DOWN_RIGHT_PRED] = ff_pred4x4_down_right_10_avx; h->pred4x4[VERT_LEFT_PRED ] = ff_pred4x4_vertical_left_10_avx; @@ -384,7 +383,6 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth h->pred8x8l[VERT_RIGHT_PRED ] = ff_pred8x8l_vertical_right_10_avx; h->pred8x8l[HOR_UP_PRED ] = ff_pred8x8l_horizontal_up_10_avx; } -#endif /* HAVE_AVX */ } #endif /* HAVE_YASM */ } |