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/h264dsp_mmx.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/h264dsp_mmx.c')
| -rw-r--r-- | libavcodec/x86/h264dsp_mmx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c index fdf44c59a9..e3854ff2ea 100644 --- a/libavcodec/x86/h264dsp_mmx.c +++ b/libavcodec/x86/h264dsp_mmx.c @@ -361,7 +361,8 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, const int chrom if (chroma_format_idc <= 1) c->h264_idct_add8 = ff_h264_idct_add8_8_mmx; c->h264_idct_add16intra = ff_h264_idct_add16intra_8_mmx; - c->h264_luma_dc_dequant_idct= ff_h264_luma_dc_dequant_idct_mmx; + if (mm_flags & AV_CPU_FLAG_CMOV) + c->h264_luma_dc_dequant_idct = ff_h264_luma_dc_dequant_idct_mmx; if (mm_flags & AV_CPU_FLAG_MMX2) { c->h264_idct_dc_add = ff_h264_idct_dc_add_8_mmx2; |