Revision 7160bb71 libavcodec/x86/dsputilenc_mmx.c

View differences:

libavcodec/x86/dsputilenc_mmx.c
1352 1352
{
1353 1353
    int mm_flags = mm_support();
1354 1354

  
1355
    if (mm_flags & FF_MM_MMX) {
1355
    if (mm_flags & AV_CPU_FLAG_MMX) {
1356 1356
        const int dct_algo = avctx->dct_algo;
1357 1357
        if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
1358
            if(mm_flags & FF_MM_SSE2){
1358
            if(mm_flags & AV_CPU_FLAG_SSE2){
1359 1359
                c->fdct = ff_fdct_sse2;
1360
            }else if(mm_flags & FF_MM_MMX2){
1360
            }else if(mm_flags & AV_CPU_FLAG_MMX2){
1361 1361
                c->fdct = ff_fdct_mmx2;
1362 1362
            }else{
1363 1363
                c->fdct = ff_fdct_mmx;
......
1375 1375
        c->hadamard8_diff[1]= hadamard8_diff_mmx;
1376 1376

  
1377 1377
        c->pix_norm1 = pix_norm1_mmx;
1378
        c->sse[0] = (mm_flags & FF_MM_SSE2) ? sse16_sse2 : sse16_mmx;
1378
        c->sse[0] = (mm_flags & AV_CPU_FLAG_SSE2) ? sse16_sse2 : sse16_mmx;
1379 1379
          c->sse[1] = sse8_mmx;
1380 1380
        c->vsad[4]= vsad_intra16_mmx;
1381 1381

  
......
1393 1393
        c->ssd_int8_vs_int16 = ssd_int8_vs_int16_mmx;
1394 1394

  
1395 1395

  
1396
        if (mm_flags & FF_MM_MMX2) {
1396
        if (mm_flags & AV_CPU_FLAG_MMX2) {
1397 1397
            c->sum_abs_dctelem= sum_abs_dctelem_mmx2;
1398 1398
            c->hadamard8_diff[0]= hadamard8_diff16_mmx2;
1399 1399
            c->hadamard8_diff[1]= hadamard8_diff_mmx2;
......
1406 1406
            c->sub_hfyu_median_prediction= sub_hfyu_median_prediction_mmx2;
1407 1407
        }
1408 1408

  
1409
        if(mm_flags & FF_MM_SSE2){
1409
        if(mm_flags & AV_CPU_FLAG_SSE2){
1410 1410
            c->get_pixels = get_pixels_sse2;
1411 1411
            c->sum_abs_dctelem= sum_abs_dctelem_sse2;
1412 1412
            c->hadamard8_diff[0]= hadamard8_diff16_sse2;
1413 1413
            c->hadamard8_diff[1]= hadamard8_diff_sse2;
1414 1414
        }
1415 1415

  
1416
        if (CONFIG_LPC && mm_flags & (FF_MM_SSE2|FF_MM_SSE2SLOW)) {
1416
        if (CONFIG_LPC && mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) {
1417 1417
            c->lpc_compute_autocorr = ff_lpc_compute_autocorr_sse2;
1418 1418
        }
1419 1419

  
1420 1420
#if HAVE_SSSE3
1421
        if(mm_flags & FF_MM_SSSE3){
1421
        if(mm_flags & AV_CPU_FLAG_SSSE3){
1422 1422
            if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
1423 1423
                c->try_8x8basis= try_8x8basis_ssse3;
1424 1424
            }
......
1429 1429
        }
1430 1430
#endif
1431 1431

  
1432
        if(mm_flags & FF_MM_3DNOW){
1432
        if(mm_flags & AV_CPU_FLAG_3DNOW){
1433 1433
            if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
1434 1434
                c->try_8x8basis= try_8x8basis_3dnow;
1435 1435
            }

Also available in: Unified diff