remaining from merge

#define NONBE_FIX_589_JBM_TC_OFFSETS                    /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */

#define FIX_MEM_REALLOC_IND_LIST                        /* VA: issue 601: failure of the automatic memory re-allocation mechanism when ind_list[] buffer is depleted in MASA mode with 2 TC*/

/* ################## End BE DEVELOPMENT switches ######################### */

#define SBA_AND_OBJECTS

#ifdef SBA_AND_OBJECTS

#define OSBA_DISC_OBJ_MCT

#define ENABLE_ISM_MD_CODING

#endif

/* ################## End BE DEVELOPMENT switches ######################### */

/* #################### Start NON-BE CR switches ########################## */

/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */