diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-11 22:04:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-11 22:04:45 +0100 |
| commit | c388db185c8034d8cb00cb83e61dbc8d2805628f (patch) | |
| tree | 2c790fb642fb65ec6dd9bb1ae286cbcac776504c /libavcodec/x86/h264_intrapred_init.c | |
| parent | a19a10a53e4a2d83320da8d15e6266d98330b80d (diff) | |
| parent | 893b353362bc220280efd8d14c4878a1cafe18a8 (diff) | |
Merge commit '893b353362bc220280efd8d14c4878a1cafe18a8' into release/0.10
* commit '893b353362bc220280efd8d14c4878a1cafe18a8':
x86: Only use optimizations with cmov if the CPU supports the instruction
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/x86/h264_intrapred_init.c')
| -rw-r--r-- | libavcodec/x86/h264_intrapred_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_intrapred_init.c b/libavcodec/x86/h264_intrapred_init.c index 967503e646..b9a6fc3e0d 100644 --- a/libavcodec/x86/h264_intrapred_init.c +++ b/libavcodec/x86/h264_intrapred_init.c @@ -188,7 +188,8 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth if (chroma_format_idc <= 1) h->pred8x8 [PLANE_PRED8x8] = ff_pred8x8_plane_mmx; if (codec_id == CODEC_ID_SVQ3) { - h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_plane_svq3_mmx; + if (mm_flags & AV_CPU_FLAG_CMOV) + h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_plane_svq3_mmx; } else if (codec_id == CODEC_ID_RV40) { h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_plane_rv40_mmx; } else { |