diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-07-31 12:32:29 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-07-31 13:54:07 +0200 |
| commit | 8728b381cbacbdff23ba9a85c2fcb78e4fd84966 (patch) | |
| tree | db3f78aeced5119fb8dff79b5af3cc923f4458db | |
| parent | d1505db06799d625420ff75de40af106c54e8c66 (diff) | |
| download | ffmpeg-8728b381cbacbdff23ba9a85c2fcb78e4fd84966.tar.gz | |
x86: h264dsp: Adjust YASM #ifdefs
This fixes compilation with YASM disabled.
| -rw-r--r-- | libavcodec/x86/h264dsp_mmx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c index 5d9da993a6..4bea78807f 100644 --- a/libavcodec/x86/h264dsp_mmx.c +++ b/libavcodec/x86/h264dsp_mmx.c @@ -194,9 +194,9 @@ H264_BIWEIGHT_10_SSE( 4, 10) void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) { +#if HAVE_YASM int mm_flags = av_get_cpu_flags(); -#if HAVE_YASM if (chroma_format_idc == 1 && mm_flags & AV_CPU_FLAG_MMX2) { c->h264_loop_filter_strength = ff_h264_loop_filter_strength_mmx2; } @@ -282,9 +282,7 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, const int chrom } } } -#endif } else if (bit_depth == 10) { -#if HAVE_YASM if (mm_flags & AV_CPU_FLAG_MMX) { if (mm_flags & AV_CPU_FLAG_MMX2) { #if ARCH_X86_32 |