Revision c8f9ef61 libavcodec/cabac.h

View differences:

libavcodec/cabac.h
379 379
#define BYTE        "16"
380 380
#define BYTEEND     "20"
381 381
#endif
382
#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
382
#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
383 383
    int bit;
384 384

  
385 385
#ifndef BRANCHLESS_CABAC_DECODER
......
535 535
    );
536 536
    bit&=1;
537 537
#endif /* BRANCHLESS_CABAC_DECODER */
538
#else /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
538
#else /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
539 539
    int s = *state;
540 540
    int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s];
541 541
    int bit, lps_mask av_unused;
......
574 574
    if(!(c->low & CABAC_MASK))
575 575
        refill2(c);
576 576
#endif /* BRANCHLESS_CABAC_DECODER */
577
#endif /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
577
#endif /* defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
578 578
    return bit;
579 579
}
580 580

  
......
683 683

  
684 684
//FIXME the x86 code from this file should be moved into i386/h264 or cabac something.c/h (note ill kill you if you move my code away from under my fingers before iam finished with it!)
685 685
//FIXME use some macros to avoid duplicatin get_cabac (cannot be done yet as that would make optimization work hard)
686
#if defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
686
#if defined(ARCH_X86) && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS)
687 687
static int decode_significance_x86(CABACContext *c, int max_coeff, uint8_t *significant_coeff_ctx_base, int *index){
688 688
    void *end= significant_coeff_ctx_base + max_coeff - 1;
689 689
    int minusstart= -(int)significant_coeff_ctx_base;
......
789 789
    );
790 790
    return coeff_count;
791 791
}
792
#endif /* defined(ARCH_X86) && && defined(CONFIG_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
792
#endif /* defined(ARCH_X86) && && defined(HAVE_7REGS) && defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
793 793

  
794 794
/**
795 795
 *

Also available in: Unified diff