Revision e69bfde6

View differences:

libavcodec/h264_cabac.c
914 914
               h->mvd_cache[list][scan8[n] - 8][l];
915 915
    int ctxbase = (l == 0) ? 40 : 47;
916 916
    int mvd;
917
    int ctx = (amvd>2) + (amvd>32);
918 917

  
919
    if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+ctx]))
918
    if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+(amvd>2) + (amvd>32)]))
920 919
        return 0;
921 920

  
922 921
    mvd= 1;
923
    ctx= 3;
924
    while( mvd < 9 && get_cabac( &h->cabac, &h->cabac_state[ctxbase+ctx] ) ) {
922
    ctxbase+= 3;
923
    while( mvd < 9 && get_cabac( &h->cabac, &h->cabac_state[ctxbase] ) ) {
924
        if( mvd < 4 )
925
            ctxbase++;
925 926
        mvd++;
926
        if( ctx < 6 )
927
            ctx++;
928 927
    }
929 928

  
930 929
    if( mvd >= 9 ) {

Also available in: Unified diff